From: Kent Fredric <kentfredric@gmail.com>
To: gentoo-dev <gentoo-dev@lists.gentoo.org>
Subject: Re: [gentoo-dev] On banning merge commits
Date: Tue, 10 May 2016 00:36:20 +1200 [thread overview]
Message-ID: <CAATnKFDeQHe3bZKCXG3rSUyjkNmfLzPh3C0pBDj8sNB9J2hoxA@mail.gmail.com> (raw)
In-Reply-To: <CAGfcS_kpF2YH7sDhnqYPJ0sYc4g0+TQJW4Z5vS0FtirDLDH7pQ@mail.gmail.com>
On 10 May 2016 at 00:23, Rich Freeman <rich0@gentoo.org> wrote:
> which introduces some of the uncleanliness of non-rebased
> merge commits. In general I'm a fan of rebasing merge commits.
Non-rebased merge commits are worst when the merge involves a
collision resolution.
While you can in theory rebase merge commits with rebase --preserve,
my experience has shown me that its very difficult to get right, and
the presence of merge collisions in the "preserved" rebase risks
getting the conflict resolution lost mid-rebase, which is not entirely
helpful.
If there was something we could feasibly put hard software policy
constraints against without any subjective "but but but" cases, it
would be these cases of "merge included conflicts".
--
Kent
KENTNL - https://metacpan.org/author/KENTNL
next prev parent reply other threads:[~2016-05-09 12:48 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-07 23:52 [gentoo-dev] On banning merge commits Patrice Clement
2016-05-08 5:09 ` Michał Górny
2016-05-08 5:44 ` cbergstrom
2016-05-08 8:21 ` Greg KH
2016-05-08 9:35 ` Daniel Campbell
2016-05-08 8:58 ` [gentoo-dev] " Duncan
2016-05-08 9:25 ` Kent Fredric
2016-05-08 10:21 ` Duncan
2016-05-08 10:35 ` Dirkjan Ochtman
2016-05-08 10:30 ` [gentoo-dev] " Dirkjan Ochtman
2016-05-08 12:00 ` Michał Górny
2016-05-08 12:31 ` Dirkjan Ochtman
2016-05-08 11:13 ` Andreas K. Hüttel
2016-05-08 11:28 ` M. J. Everitt
2016-05-08 9:15 ` Andrew Savchenko
2016-05-08 10:06 ` Amadeusz Żołnowski
2016-05-08 12:53 ` Brian Dolbec
2016-05-08 15:15 ` Jeroen Roovers
2016-05-08 22:25 ` Daniel Campbell
2016-05-08 11:25 ` Andreas K. Hüttel
2016-05-08 11:57 ` Rich Freeman
2016-05-08 12:07 ` Kent Fredric
2016-05-08 21:56 ` [gentoo-dev] " Duncan
2016-05-08 12:09 ` [gentoo-dev] " Anthony G. Basile
2016-05-08 12:18 ` Kent Fredric
2016-05-08 12:34 ` Rich Freeman
2016-05-08 12:43 ` Anthony G. Basile
2016-05-08 22:02 ` [gentoo-dev] " Duncan
2016-05-08 17:03 ` [gentoo-dev] " Alexis Ballier
2016-05-08 17:07 ` Kent Fredric
2016-05-09 11:27 ` Kristian Fiskerstrand
2016-05-09 12:23 ` Rich Freeman
2016-05-09 12:36 ` Kent Fredric [this message]
2016-05-09 12:59 ` Rich Freeman
2016-05-10 12:04 ` Alexis Ballier
2016-05-10 14:18 ` Kent Fredric
2016-05-11 10:21 ` Alexis Ballier
2016-05-11 14:34 ` Kent Fredric
2016-05-11 15:12 ` Rich Freeman
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=CAATnKFDeQHe3bZKCXG3rSUyjkNmfLzPh3C0pBDj8sNB9J2hoxA@mail.gmail.com \
--to=kentfredric@gmail.com \
--cc=gentoo-dev@lists.gentoo.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox