Tag: merging

Found 36 results for 'merging'.

1) version-control - Why use pull requests instead of merging
2) git - Is it better to start a Pull Request or perform a local merge commit on master?
3) svn - Branching strategy for moving feature branch between versions
4) code-reviews - What can I do to let our team have code reviews of branch merges having hundreds of screens worth of Github diffs?
5) version-control - What is a good frequency for merging up feature branches to a main line?
6) git - Should I merge the dev branch into my user story branch?
7) git - Git temporary code-change
8) design-patterns - Generic PHP web interface for handling concurrent updates optimistically
9) programming-practices - Proper sequence of actions for merging using SVN?
10) svn - Is my company merging branches wrong?
11) version-control - Why do so many projects prefer "git rebase" over "git merge"?
12) version-control - What is a good frequency for merging up feature branches to a main line?
13) git - How can a developer overcome their fear of merge conflicts?
14) algorithms - Merging algorithm for overlapping intervals
15) development-process - Avoid or minimize merge conflicts while using NuGet and GitFlow
16) version-control - Should I back-merge every day in a large project?
17) git - What's so difficult about SVN merges?
18) visual-studio - Strategies for merging 1 year of development in Visual Studio
19) version-control - Is it better to merge "often" or only after completion do a big merge of feature branches?
20) svn - One commit in two branches: what happened?
21) git - Finish feature reverted commits from develop
22) git - How to deal with merging of Visual Studio projects
23) version-control - Should developers merge code across branches?
24) version-control - Should I merge from the same branch or from a merge?
25) version-control - How can I avoid editing conflicts repeatedly when merging from one to branch to another?
26) git - Why are these seemingly unnecessary merges happening in git?
27) programming-practices - Is it a newbie mistake to avoid branching?
28) version-control - Why would you not commit merged changes immediately?
29) version-control - TFS Branching Advice
30) .net - Branching and Merging Business Data
31) git - New developer can't keep up with branch merges
32) git - How can I split work done in one branch without conflicts on merge?
33) git - How can I prevent users from merging origin/X into Y in git?
34) branching - Merging branches where the same code was worked on
35) programming-practices - Develop in trunk and then branch off, or in release branch and then merge back?
36) algorithms - Efficient algorithm for joining sieves