unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Karl Fogel <kfogel@red-bean.com>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Error in BZR Wiki document?
Date: Tue, 05 Jan 2010 22:32:49 -0500	[thread overview]
Message-ID: <87eim3nc0u.fsf@red-bean.com> (raw)
In-Reply-To: <87aawsh9yu.fsf@telefonica.net> ("Óscar Fuentes"'s message of "Tue, 05 Jan 2010 16:01:29 +0100")

Óscar Fuentes <ofv@wanadoo.es> writes:
>Jan Djärv <jan.h.d@swipnet.se> 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.

-Karl




      parent reply	other threads:[~2010-01-06  3:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-05 14:40 Error in BZR Wiki document? Jan Djärv
2010-01-05 15:01 ` Óscar Fuentes
2010-01-05 15:45   ` Stefan Monnier
2010-01-06  3:32   ` Karl Fogel [this message]

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=87eim3nc0u.fsf@red-bean.com \
    --to=kfogel@red-bean.com \
    --cc=emacs-devel@gnu.org \
    --cc=ofv@wanadoo.es \
    /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).