From: phillip.lord@russet.org.uk (Phillip Lord)
To: Eli Zaretskii <eliz@gnu.org>
Cc: Nicolas Petton <nicolas@petton.fr>, emacs-devel@gnu.org
Subject: Re: ChangeLog entries
Date: Mon, 10 Aug 2015 22:54:14 +0100 [thread overview]
Message-ID: <87oaieq06x.fsf@russet.org.uk> (raw)
In-Reply-To: <83io8noycr.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 10 Aug 2015 20:19:16 +0300")
Eli Zaretskii <eliz@gnu.org> writes:
>> From: Nicolas Petton <nicolas@petton.fr>
>> Cc: emacs-devel@gnu.org
>> Date: Mon, 10 Aug 2015 15:02:59 +0200
>>
>> > Personally, I would have rebased, but a rebase vs merge discussion is
>> > unlikely to add anything substantial to the world.
>>
>> I also usually rebase, I probably should have done it here too.
>
> You can do that if you want, assuming your branch is a simple one-off
> feature branch, and you never merged from master onto it. Otherwise,
> you really need to know what you are doing when rebasing, or else you
> will risk bringing the same changes more than once.
>
> For this reason, we recommend that people who are not that fluent in
> Git _do_ merge, and not rebase. Since Emacs generally uses a
> merge-based workflow between its official branches, merging (including
> implicit merges done by "git pull") fits better than rebasing.
I publicly apologise to everyone for attempting to make a joke about
rebase vs merge. I realise now that some issues are just fit topics for
humour, and that my joke was not funny anyway.
Phil
next prev parent reply other threads:[~2015-08-10 21:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-09 15:11 ChangeLog entries Eli Zaretskii
2015-08-09 15:46 ` Phillip Lord
2015-08-09 18:23 ` Eli Zaretskii
2015-08-10 9:16 ` Phillip Lord
2015-08-10 9:37 ` Artur Malabarba
2015-08-10 11:55 ` Phillip Lord
2015-08-10 13:02 ` Nicolas Petton
2015-08-10 17:19 ` Eli Zaretskii
2015-08-10 21:17 ` Paul Eggert
2015-08-10 21:54 ` Phillip Lord [this message]
2015-08-09 16:05 ` Paul Eggert
2015-08-09 18:24 ` 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=87oaieq06x.fsf@russet.org.uk \
--to=phillip.lord@russet.org.uk \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=nicolas@petton.fr \
/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.