~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Aaron Bentley
Date: 2006-03-01 18:16:31 UTC
mto: (1551.19.24 Aaron's mergeable stuff) (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1558.4.5 Aaron's integration)
mto: This revision was merged to the branch mainline in revision 1597.
Revision ID: abentley@panoramicfeedback.com-20060301181631-f3b73117aa68b73f

Updated docs to clarify conflict handling

added added

removed removed

1701

branch, automatically determining an appropriate base. If this

1702

fails, you may need to give an explicit base.

1703

1704

Merge will do its best to combine the changes in two branches, but there

1705

are some kinds of problems only a human can fix. When it encounters those,

1706

it will mark a conflict. A conflict means that you need to fix something,

1707

before you should commit.

1708

1709

Use bzr resolve when you have fixed a problem.

1710

1704

1711

Examples:

1705

1712

1706

1713

To merge the latest revision from bzr.dev