This is about joining two or more development histories together in version control software.
Questions tagged [merging]
71 questions
233
votes
15 answers
New developer can't keep up with branch merges
I am the new developer - this is my first programming position.
My issue is this: We use git - I cut a branch from our develop branch, then I start working on the minor task I've been assigned. It's very slow, because I'm inexperienced. By the time…
K--
- 2,529
- 3
- 10
- 12
81
votes
7 answers
Why do so many projects prefer "git rebase" over "git merge"?
One of the advantages of using a DVCS is the edit-commit-merge workflow (over edit-merge-commit often enforced by a CVCS). Allowing each unique change to be recorded in the repository independent of merges ensures the DAG accurately reflects the…
Jace Browning
- 2,173
- 1
- 15
- 25
54
votes
5 answers
Is it better to merge "often" or only after completion do a big merge of feature branches?
Say multiple branches are being developed, A and B, as well as a incremental "bug fix" branch C.
Now C is already "finished" and merged into master. A and B are still in development and will not be fixed before (maybe) another bug fix branch is…
paul23
- 1,061
- 1
- 8
- 14
51
votes
11 answers
How can a developer overcome their fear of merge conflicts?
I'm a beginner at collaborative development, I started learning about merge conflicts.
And I have this question.
Is it possible for a developer to deliberately postpone merging because he doesn't want to be the one resolving a potential conflict?
If…
YsfEss
- 521
- 4
- 7
40
votes
2 answers
Is it better to start a Pull Request or perform a local merge commit on master?
I have been using GitHub for quite some time now and I usually used to push my feature-branches and then start a Pull Request which I myself merged. I found it helped me keep track of where I merged branches.
But recently I have been reading more…
Ashhar Hasan
- 919
- 1
- 8
- 14
39
votes
6 answers
Whose responsibility is it to fix merge conflicts?
Say that A is working on a branch based off master and B merges changes into the master branch, which introduces merge conflicts between A's branch and master.
Whose responsibility is it to fix merge conflicts? I am not intending to be petty, so in…
K--
- 2,529
- 3
- 10
- 12
38
votes
4 answers
Why doesn't git merge adjacent lines without conflict?
I recently learned that when merging two branches in git, if there are changes on two adjacent lines git declares this a conflict. For example, if file test.txt has this content:
Line 1: A
Line 2: B
Line 3: C
Line 4: D
and in branch master we…
rlandster
- 939
- 1
- 8
- 14
31
votes
4 answers
Strategies for merging 1 year of development in Visual Studio
I have a client who insisted that we keep our new development separate from the main branches for the entirety of 2016. They had 3-4 other teams working on the application in various capacities. Numerous large changes have been made (switching how…
user258451
- 421
- 3
- 5
29
votes
7 answers
Is my company merging branches wrong?
I recently came across an MSDN article about branching and merging and SCM: Branching and Merging Primer - Chris Birmele.
In the article they say 'big bang merge' is a merging antipattern:
Big Bang Merge — deferring branch merging to the end of…
user6567423
- 433
- 4
- 9
28
votes
6 answers
What's so difficult about SVN merges?
Possible Duplicate:
I’m a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS?
Every once in a while, you hear someone saying that distributed version control (Git, HG) is inherently better than centralized…
Mason Wheeler
- 82,151
- 24
- 234
- 309
26
votes
5 answers
Why use pull requests instead of merging
What is the advantage of using pull requests instead of simply merging a branch into master without one? Particularly on a team where all developers have full access to master.
Goose
- 1,858
- 2
- 15
- 27
20
votes
4 answers
Why would you not commit merged changes immediately?
My office uses Git and SourceTree for our version control. This came about because when I joined there was zero version control and SourceTree was the only system I had ever used. I am not an expert by any means, but I am the most experienced out of…
David K
- 311
- 1
- 2
- 8
13
votes
2 answers
Big project layout : adding new feature on multiple sub-projects
I want to know how to manage a big project with many components with version control management system.
In my current project there are 4 major parts.
Web
Server
Admin console
Platform.
The web and server part uses 2 libraries that I wrote. In…
Shiplu Mokaddim
- 261
- 1
- 13
11
votes
2 answers
Is the inconvenience about merging in SVN prior to v1.5 obsolete by now when lack of metadata isn't the case anymore?
I'm getting started with SVN and so many sources say that merging is very difficult in SVN as compared to DVCS tools. The most recent questions I could find here on SE are from 2012.
Sometimes there's a mention that the reason is that SVN prior to…
Torben Gundtofte-Bruun
- 572
- 6
- 17
10
votes
3 answers
How to deal with merging of Visual Studio projects
Visual studio projects, as opposed to makefiles or other projects I know, have some quirks:
The directory structure of the project has no real connection to actual directory structure - all directories are purely virtual - this makes it harder to…
Tomáš Zato
- 853
- 1
- 10
- 20