~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/merge.txt

• browse files at revision 185
• compare with another revision
• download diff
• download tarball
• view history from revision 185

• reverse the comparison (185 to 1551.8.24)
• stop comparing with revision 1551.8.24

Show diffs side-by-side

added

removed

doc/merge.txt

 

1

Merging

 

2

=======

 

3

 

 

4

There should be one merge command which does the right thing, and

 

5

which is called 'merge'.

 

6

 

 

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

 

9

pulling them again.

 

10

 

 

11

There should be some intelligence about working out what changes have

 

12

already been merged. 

 

13

 

 

14

The tool intelligently chooses (or perhaps synthesizes) an ancestor

 

15

and two trees to merge.  These are then intelligently merged.

 

16

 

 

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.

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1