4
There should be one merge command which does the right thing, and
5
which is called 'merge'.
7
The merge command pulls a changeset or a range of changesets into your
8
tree. It knows what changes have already been integrated and avoids
11
There should be some intelligence about working out what changes have
14
The tool intelligently chooses (or perhaps synthesizes) an ancestor
15
and two trees to merge. These are then intelligently merged.
17
Merge should refuse to run (unless forced) if there are any
18
uncommitted changes in your tree beforehand. This has two purposes:
19
if you mess up the merge you won't lose anything important; secondly
20
this makes it more likely that the merge will be relatively pure.
added
removed
doc/merge.txt
