racl101 + kdiff3   4

How to use kdiff3 as a 3-way merge tool with mercurial, git, and Tower.app - Ted Naleid
This paragraph is key in understanding 3 way merge. It explains why applications use terms such as Local, remote, base and merge (or result): A 3-way merge actually has four important sources of information: LOCAL - your file with the changes you’ve made to it REMOTE - the file you’re merging in, possibly authored by someone else BASE - the common ancestor file that LOCAL and REMOTE came from MERGE_RESULT - the file resulting from the merge where you resolve conflicts
Threewaymerge  Tutorial  Guide  Toread  tower  totry  explanation  tounderstand  ReferencE  kdiff3  Blog  Tool  Diff 
march 2015 by racl101

Copy this bookmark: