[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Error in BZR Wiki document?

From: Karl Fogel
Subject: Re: Error in BZR Wiki document?
Date: Tue, 05 Jan 2010 22:32:49 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux)

Óscar Fuentes <address@hidden> writes:
>Jan Djärv <address@hidden> writes:
>> Quote:
>> "The merge may fail due to a change that conflicts with your
>> branch. You’ll need to fix the problem (looking for conflict markers
>> and editing, just as in CVS), then
>>       bzr resolve -m file-you-changed ...      # Mark these conflicts
>> as resolved.
>>                                                # Bazaar keeps track of
>> unresolved conflicts,
>>                                                # and won't let you
>> commit until all are resolved.
>> "
>> Ok, I edit ChangeLog and remove markers, then:
>> % bzr resolve -m ChangeLog
>> bzr: ERROR: no such option: -m
>Yup, that's an error on the document.

I don't want to sound like a nagging uncle, but... did anyone *fix* the
error?  It's a wiki, after all :-).

I see the "-m" is still there.  I've removed it now.  It took me
literally twenty seconds from start to finish.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]