If you are working with other people on a project, it is likely that Chris@578: at some point you'll find that more than one of you have edited the Chris@578: same lines in the same file, in different ways.
Chris@578: Chris@578:When that happens and you try to merge the two versions, EasyMercurial Chris@578: will pop up a merge window that looks a bit like this.
Chris@578: Chris@578:(This is actually a separate program, not part of EasyMercurial: it's Chris@578: a merge tool called kdiff3.)
Chris@578: Chris@578:This looks a bit complicated, but it is there to help you pick which Chris@578: of the changes from each of the two “rival” versions of the file you Chris@578: want to use in your merged version.
Chris@578: Chris@578:The top middle one is your current version. That's Chris@578: the one you had before you decided to merge the other version into Chris@578: it.
Chris@578: Chris@578:At top right is the version you're merging. That's the other Chris@578: rival version – the one that the other person can see in their copy Chris@578: of the repository.
Chris@578: Chris@578:At top left is the common ancestor. That's the version that both Chris@578: of you had, before you started editing it in different ways.
Chris@578: Chris@578:At the bottom is the output.
Chris@578: Chris@578:Each conflict (a line which you have both changed in different ways) Chris@578: is shown with Merge Conflict in the output at the bottom. To sort Chris@578: out the conflicts and get the right output, you need to go through Chris@578: them one by one, for each one pressing the A, B, or C button to say Chris@578: whether for this line you want the top-left, top-middle, or top-right Chris@578: version to “win”. (You can choose more than one, if you want both Chris@578: versions of a line to appear.)
Chris@578: Chris@578:Then having resolved a conflict, press the three-arrows-down toolbar Chris@578: button to go to the next one – and when you've done them all, save Chris@578: and exit.
Chris@578: Chris@578:The most important thing to remember is that whatever appears in the Chris@578: bottom pane is what you'll get as a result.
Chris@578: Chris@578:No matter how confusing the process, just remember that if it looks Chris@578: correct in the bottom pane, it will be correct when you save and Chris@578: exit. You can even edit the file directly in the bottom pane if you Chris@578: aren't happy with the way the merge is going.
Chris@578: Chris@578: Chris@578: Chris@578: