robert.collins at canonical.com
Fri May 1 01:57:29 BST 2009
On Thu, 2009-04-30 at 17:45 -0700, Eric Berry wrote:
> Hi Martin, thanks for the quick response!
> I tried this:
> bzr merge -r 3..2 .
> This resulted in the changed files being marked as having conflicts.
> If I run a bzr status just before performing the merge it shows that I
> do not have any uncommitted changes.
> Is there a way to not have to resolve the conflicted files?
This almost certainly means you have had other changes after rev 3 that
conflict with the change in rev 3.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090501/6ea0d2eb/attachment.pgp
More information about the bazaar