From: "Jan Djärv" <jan.h.d@swipnet.se>
To: Emacs-Devel <emacs-devel@gnu.org>
Subject: Error in BZR Wiki document?
Date: Tue, 05 Jan 2010 15:40:33 +0100 [thread overview]
Message-ID: <4B434F61.6090305@swipnet.se> (raw)
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
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).
next reply other threads:[~2010-01-05 14:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-05 14:40 Jan Djärv [this message]
2010-01-05 15:01 ` Error in BZR Wiki document? Óscar Fuentes
2010-01-05 15:45 ` Stefan Monnier
2010-01-06 3:32 ` Karl Fogel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B434F61.6090305@swipnet.se \
--to=jan.h.d@swipnet.se \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).