Questions tagged [Branching] (36)

1
answer

Unity gave this error, what to do?

Cloned the repository with sourceTree from branch develop - everyone who downloaded, everything works. Note: desktop git installed. Version of unity 19.1.14.
lela43 asked April 18th 20 at 13:19
4
answers

How to merge branches in GIT?

Work with Networks. General branch for dev, I deduce from it a branch for a task, for example, dev_taskID when finished working with the task, then pour in the dev branch, do git pull and create a merge request. On the server appears as if I comitel not in your branch tasks, and directly in dev. So, the crux of the matter....
Loyce.Keebler27 asked March 21st 20 at 12:44
1
answer

How to remove a bunch of unnecessary branches in the GitHub repository?

There's an old project where I had broken features and fixes on separate branches in the backlog, and then just margil them locally without a Pull Request in github. Now in the repository a bunch of branches, from which it is necessary to get rid of. How? Make a bunch of PR in hindsight?
Hobart asked March 19th 20 at 08:24
3
answers

Merge 2 Git branches?

Hi all!This: 1. The Git Repository. 2. A project which has 2 branches: • v2 — it has produced and tachometry changes in 3 files. Suppose that it is in the first row 10, second 5, third 6. • master — the changes in those 3 files in the same rows, but they also needed.3. The conflict in the merge between master and v2.Task: ...
Haven asked October 10th 19 at 14:53
2
answers

Git to isolate a branch in a different repository?

There is a local git repository with multiple branches, there is a need to freeze the development of one single branch, and remove it from the main repository. How can we make this thread into another repository while keeping the history of this branch in the new repository?
wilmer.Mohr asked October 10th 19 at 14:53
3
answers

How to organize independent pieces of the app in GIT?

There is a main application and a lot of demons to him. Code demons does not intersect with the main application and I would like some way to distinguish it from the main code. Make a separate git repository impossible. As far as the normal solution would be to create separate branches for each daemon or licensors and only ...
Dominique_Wisoky45 asked October 10th 19 at 12:45
3
answers

The choice of the model of branching for Git?

In our project as VCS we use Git with such a branching model. However, this model does not suit us, because it presupposes the existence of releases with pre-determined functionality. The project historically different mechanism: features are developed in parallel, with not known beforehand, as soon as one or the other feat...
floy_Murray asked October 8th 19 at 01:13
1
answer

Git hooks (bare). How to know the name of the branch which had made the last commit?

subj Or, as in the hook to know the name of the branch to which the push occurred? In env didn't find anything similar.
kelsi.Crooks35 asked October 3rd 19 at 19:53
1
answer

Interactive merge two branches in git, netbeans?

A couple of months ago from the current version of the project did spur. Changes were made on both branches in parallel and now the question arose about their connection. When you merge revisions to a file are often just two versions of the file, from one branch on top, then another after it. with the same success I could j...
jany5 asked October 3rd 19 at 15:50
2
answers

Practical use of branching in Mercurial?

Gentlemen, in a content management system like Mercurial there are many ways to "wetwet" history: branch (unnamed and named), tag, bookmarks, clone. Share your experience, as in real projects of different scale is the use of these features to: 1. Management major versions (v1, v2, v3) 2. Minor (v1.1, v1.2, ...) 3. Poderi (v...
Oswaldo_Altenwer asked October 3rd 19 at 10:48