Questions tagged [merging]
This is about joining two or more development histories together in version control software.
72 questions
2
votes
2
answers
1k
views
What are the pros and cons of using cherry-pick versus merge for release management? [closed]
What are the pros and cons of using cherry-pick versus merge for release management?
Background
We have a dev branch, and just created a release1 branch from it. Folks will commit relevant content to ...
- 565
3
votes
2
answers
751
views
How to gain confidence during a large, complex merge?
I recently finished a large merge with many complex conflicts that needed to be resolved. The branches had been separate from one another for several months while different teams contributed to each ...
- 182
7
votes
4
answers
2k
views
How to collaboratively resolve conflicts in Git?
We are working on a big feature, because we don't know how to make it any smaller. I got to a point, when I need to merge my changes from our feature branch into develop branch (we're using Git Flow), ...
- 411
0
votes
1
answer
248
views
What is the correct way to deal with Pull Request updates concerning an interface with a Continuous Integration script: rebase or merge?
I work with other Software Engineers on a web app product. Also, the source code is hosted on GitHub.
Recently, there was an introduction of a Continuous Integration procedure enabled by a script ...
- 149
4
votes
1
answer
4k
views
GitFlow merge conflicts between release and develop
I've been using Git and GitFlow for quite a few years now, but this is still confusing me.
Let's say I open branch release/1.1.1 to let the stakeholders test their application.
While they're testing ...
- 161
0
votes
2
answers
95
views
Rapid rate of merging new code with minimal testing [closed]
In some companies, code is merged at a rapid rate by multiple teams with minimal testing and somehow the number of bugs is kept to a minimum.
In other companies, this leads to chaos and terrible ...
- 17
2
votes
0
answers
887
views
Better alternative for cherry picking across heavily diverged branches
I'm currently trying to update the linux kernel used in a xilinx SoC, my company has an internal repo/fork of xilinx open source linux with a bunch of kernel drivers for our custom hardware & ...
- 29
3
votes
1
answer
2k
views
how to easily merge future updates after cherry picking commits. - Or merge a specific commit first?
A particularly nasty bug just happened to our software. (JS/react something was preventing onclick from firing about half the time - turned out a constant rerender was happening). This wasn't really ...
- 1,131
52
votes
11
answers
11k
views
How can a developer overcome their fear of merge conflicts? [closed]
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 ...
- 531
2
votes
1
answer
656
views
How to review and merge a big feature
We are creating a new page on our website which will require overall ~5000 LOC.
Now the problems here are:
How to get so many lines reviewed?
When to merge these changes to master for release?
How we ...
- 81
40
votes
6
answers
12k
views
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 ...
- 2,539
60
votes
5
answers
30k
views
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 ...
- 1,131
29
votes
7
answers
10k
views
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 ...
- 433
4
votes
3
answers
3k
views
Applying hotfix to intermediate commit on master
Below is the Gitflow workflow followed, where master branch has the commit history(git tag) of different releases.
From release mgmt aspect, we are deleting the release branch after merging with ...
- 2,325
0
votes
1
answer
334
views
One person controls only one folder, in a repository
How can I give complete control of one folder to one person, while the rest is in the control of another person. Control means they have the power to approve pull requests and commit to master and ...
- 101