how do I continue a merge after resolving conflicts?

[Martin Pool]

On 18 Nov 2005, Jamie Wilkinson <jaq at spacepants.org> wrote:
> This one time, at band camp, Jamie Wilkinson wrote:
> >I've just tried to merge Martin's latest into my tree, in which I've
> >modified bzrlib/tree.py to exclude .bzrignore from the tarball export (see
> >earlier post).  I get a conflict when running 'bzr merge', and so I fix it
> >up, and bzr resolve it, but now the tree's in a state where there are
> >uncommitted changes; bzr merge aborts.  I realise there are uncommitted
> >changes, because I was fixing the conflict, but I now want it to press on.
> >
> >What's the correct method of continuing?  Do I commit the half-merge, or is
> >there magic that says now carry on?
> 
> Forget it; it was at the end of the merge anyway :)  Just needed to be
> committed.

For those following along at home: bzr merge always merges all files,
leaving conflicts in those where they occur.  There's no need to do
another merge from the same source after you resolve the conflicts --
just fix them up and commit.

We think it's a good practice to make just one self-contained change in
each commit, and in particular only one merge and directly related
fixups.  So merge normally refuses to run if there are uncommitted
changes.  But you can --force it.

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051118/ae5f6be6/attachment.pgp