← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-11-25 16:04:57 UTC
  • mto: This revision was merged to the branch mainline in revision 4843.
  • Revision ID: nmb@wartburg.edu-20091125160457-56y1yl8iw4y9q4x8
Add discussion of conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
4054
4054
    keep the content of the tree as it was, but it will clear the list of
4055
4055
    pending merges.  The next commit will then contain all of the changes that
4056
4056
    would have been in the merge, but without any mention of the other parent
4057
 
    revisions.
 
4057
    revisions.  Because this technique forgets where these changes originated,
 
4058
    it may cause additional conflicts on later merges involving the source and
 
4059
    target branches.
4058
4060
    """
4059
4061
 
4060
4062
    _see_also = ['cat', 'export']