From: Richard Stallman <rms@gnu.org>
To: Bojan Nikolic <bojan@bnikolic.co.uk>
Cc: emacs-devel@gnu.org
Subject: Re: Bzr document unclear. There is no "conflict markers".
Date: Mon, 04 Jan 2010 11:23:34 -0500 [thread overview]
Message-ID: <E1NRpiQ-0004n8-6m@fencepost.gnu.org> (raw)
In-Reply-To: <871vi6izni.fsf@bnikolic.co.uk> (message from Bojan Nikolic on Sun, 03 Jan 2010 22:36:49 +0000)
The quick answer is that the "quickfixes" branch could have diverged
from the trunk, for example because some of the developers changes have
not been accepted (yet) into the trunk.
The concept of "accepted into the trunk" puzzles me. If someone has
write access, he can install his changes into the trunk, right? So if
he has committed all his past changes, there's nothing to merge --
right?
Are you assuming the case of a person who doesn't have write access
on Savannah?
next prev parent reply other threads:[~2010-01-04 16:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-03 12:44 Bzr document unclear. There is no "conflict markers" Jan Djärv
2010-01-03 13:39 ` Eli Zaretskii
2010-01-03 14:33 ` Jan Djärv
2010-01-03 15:10 ` Eli Zaretskii
2010-01-03 19:17 ` Jan Djärv
2010-01-03 19:25 ` Eli Zaretskii
2010-01-04 0:14 ` Jan Djärv
2010-01-03 15:24 ` Bojan Nikolic
2010-01-03 21:59 ` Richard Stallman
2010-01-03 22:36 ` Bojan Nikolic
2010-01-04 16:23 ` Richard Stallman [this message]
2010-01-04 17:08 ` Stefan Monnier
2010-01-04 20:07 ` Bojan Nikolic
2010-01-04 4:08 ` Eli Zaretskii
2010-01-04 16:23 ` Richard Stallman
2010-01-04 18:27 ` 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=E1NRpiQ-0004n8-6m@fencepost.gnu.org \
--to=rms@gnu.org \
--cc=bojan@bnikolic.co.uk \
--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).