From: Stefan Monnier <monnier@iro.umontreal.ca>
To: rms@gnu.org
Cc: Bojan Nikolic <bojan@bnikolic.co.uk>, emacs-devel@gnu.org
Subject: Re: Bzr document unclear. There is no "conflict markers".
Date: Mon, 04 Jan 2010 12:08:54 -0500 [thread overview]
Message-ID: <jwvbph94x40.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <E1NRpiQ-0004n8-6m@fencepost.gnu.org> (Richard Stallman's message of "Mon, 04 Jan 2010 11:23:34 -0500")
> 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?
I have many changes on my local branch which the maintainers haven't
accepted yet. Of course, could install them anyway since I have write
access, but Stefan would bite my head off if I did.
Stefan
next prev parent reply other threads:[~2010-01-04 17:08 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
2010-01-04 17:08 ` Stefan Monnier [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvbph94x40.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=bojan@bnikolic.co.uk \
--cc=emacs-devel@gnu.org \
--cc=rms@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.