List Question
20 TechQA 2017-09-19T09:37:06.257000Diff between 2 git commits except contained in 3rd commit
178 views
Asked by Dmitriusan
Can I diff more than one file at a time using subversion and Beyond Compare?
753 views
Asked by gailbear
Is it possible to change VSCode 3-way merge editor layout?
96 views
Asked by Paulo de Tarso
Programmatically make use of eclipse's merge and diff viewers
940 views
Asked by Craig
How to automatically put a file as resolved after merge
1.9k views
Asked by INS
Skip undo step in Vim
742 views
Asked by Kevin Burke
How do I 3-way merge using TortoiseHg 2.0.3 and Beyond Compare 3.2.4
1.9k views
Asked by David Ei
The difference between "3 way Merge Sort" and "3 way Natural Merge Sort"
445 views
Asked by AndreiSold
Does git revert also use the 3-way-merge?
484 views
Asked by white_gecko
Use kdiff3 to "save a partial merge", leaving in (or adding?) unresolved conflict markers
381 views
Asked by user2864740
Understanding Meld 3 way merge with Git
16.3k views
Asked by Naterade
TFS: Branch, label or shelve?
1.7k views
Asked by user628661
Main differences between P4Merge and DiffMerge
725 views
Asked by Peter Kofler
Is git's merge conflict resolution more efficient than other SCMs and merge tools?
1.5k views
Asked by inger
Mercurial Workflow for small team
1.9k views
Asked by Tarski
Git & ApartCI - How to verify code conflicts before inviting functional breakage?
276 views
Asked by overexchange
Is there a sensible way to merge Visual Studio project files (.csproj) between branches?
1.7k views
Asked by Ian Ringrose
Pull Request merged and reverted in feature-branch prevents from re-merging it
149 views
Asked by mzakrze
Conceptually how is `git revert` related to three way merge?
478 views
Asked by Tim
How does the 3 way merge in Mercurial/Meld work?
16k views
Asked by Asa Ayers