Mercurial > hg > easyhg

annotate help/topics/34.txt @ 531:f56e5c39aad1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start work on merge topic
author Chris Cannam
date Wed, 23 Nov 2011 17:03:43 +0000
parents
children 06507a59f2b8
rev   line source
Chris@531 1 {Sharing changes}
Chris@531 2
Chris@531 3 How do I use the Merge window?
Chris@531 4
Chris@531 5 If you are working with other people on a project, it is likely that
Chris@531 6 at some point you'll find that more than one of you have edited the
Chris@531 7 same lines in the same file, in different ways.
Chris@531 8
Chris@531 9 When that happens and you try to merge the two versions, EasyMercurial
Chris@531 10 will pop up a merge window that looks a bit like this.
Chris@531 11
Chris@531 12 #merge50
Chris@531 13
Chris@531 14 (This is actually a separate program, a merge tool called kdiff3.)
Chris@531 15
Chris@531 16 This looks a bit complicated, but it is there to help you pick which
Chris@531 17 of the changes from each of the two "rival" versions of the file you
Chris@531 18 want to use in your merged version.
Chris@531 19
Chris@531 20