From: Eli Zaretskii <eliz@gnu.org>
To: Christopher Schmidt <christopher@ch.ristopher.com>
Cc: emacs-devel@gnu.org
Subject: Re: bzr commit raises a weird conflict
Date: Tue, 09 Apr 2013 18:13:38 +0300 [thread overview]
Message-ID: <8338uzbuu5.fsf@gnu.org> (raw)
In-Reply-To: <87zjx8hz7b@ch.ristopher.com>
> From: Christopher Schmidt <christopher@ch.ristopher.com>
> Date: Tue, 9 Apr 2013 09:42:39 +0100 (BST)
>
> Bastien <bzg@gnu.org> writes:
> > How can I resolve this "conflict"?
> >
> > I know it safer to build from a dedicated branch, and to use a clean
> > branch for commits, but still, I don't understand what's wrong.
>
> I don't understand what's wrong, either.
The directory is removed in the master repository, but not in the
local branch. That's a conflict that prevents a clean merge.
> bzr resolve --take-other
>
> solved it for me. This is probably another bug in bzr.
It's not a bug, and the above is precisely the way to resolve such
conflicts (of course, you could also use --take-mine, but in this case
that would be wrong).
Bastien, next time you have such non-text conflicts, type
bzr help conflict-types
and read there (it's a long entry, so redirect to a pager or to an
Emacs buffer). In particular, this specific conflict is described
under "Deleting parent".
next prev parent reply other threads:[~2013-04-09 15:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 7:50 bzr commit raises a weird conflict Bastien
2013-04-09 8:42 ` Christopher Schmidt
2013-04-09 9:37 ` Bastien
2013-04-09 15:13 ` Eli Zaretskii [this message]
2013-04-10 7:38 ` Christopher Schmidt
2013-04-10 15:31 ` Eli Zaretskii
2013-04-12 8:49 ` Bastien
2013-04-09 10:28 ` Giorgos Keramidas
2013-04-09 11:23 ` Bastien
2013-04-09 15:31 ` Eli Zaretskii
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=8338uzbuu5.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=christopher@ch.ristopher.com \
--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).