[Top][All Lists]

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

Error in BZR Wiki document?

From: Jan Djärv
Subject: Error in BZR Wiki document?
Date: Tue, 05 Jan 2010 15:40:33 +0100
User-agent: Thunderbird (X11/20090817)

"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

Hmm, lets remove -m then:
% bzr resolve ChangeLog
src/ChangeLog is not conflicted

What is bzr resolve supposed to do anyway?

        Jan D.

(BTW, pulling trunk again for 5 Mbytes worth of changes required 177 Mbytes to download from the server).

reply via email to

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