unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Felix Lechner via "Development of GNU Guix and the GNU System distribution." <guix-devel@gnu.org>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: Andreas Enge <andreas@enge.fr>,
	Christopher Baines <mail@cbaines.net>,
	guix-devel@gnu.org
Subject: Re: Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.]
Date: Sun, 11 Jun 2023 15:40:55 -0700	[thread overview]
Message-ID: <CAFHYt54ZcV8xEekiRvxHTo2mMbBSepreCtz4TH=X_EqucNYi4Q@mail.gmail.com> (raw)
In-Reply-To: <87352xady4.fsf@gmail.com>

Hi Maxim,

On Sun, Jun 11, 2023 at 2:26 PM Maxim Cournoyer
<maxim.cournoyer@gmail.com> wrote:
>
> rebasing causes the PGP-signed commits to be resigned with the key of
> the people of does the rebase, which obfuscates the origin seal
> somewhat.
>
> I think we should continue to prefer merging

Let's take your argument all the way for a moment, please. What if the
signed merge commits were to serve as the mutual approvals Ludo' has
been asking for?

Non-forward merges could also be used for changes involving just a
single commit, although that would create more overhead and result in
a more complicated project history.

Kind regards
Felix


  reply	other threads:[~2023-06-11 22:42 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <168610879676.2825.9044237296073582277@vcs2.savannah.gnu.org>
     [not found] ` <20230607033317.826FCC23EDC@vcs2.savannah.gnu.org>
2023-06-07 10:59   ` 01/03: gnu: wxwidgets: Add libxtst to inputs Christopher Baines
2023-06-11  3:17     ` Maxim Cournoyer
2023-06-11  8:44       ` Rebasing or merging? [was: Re: 01/03: gnu: wxwidgets: Add libxtst to inputs.] Andreas Enge
2023-06-11 21:25         ` Maxim Cournoyer
2023-06-11 22:40           ` Felix Lechner via Development of GNU Guix and the GNU System distribution. [this message]
2023-06-12  0:47             ` Maxim Cournoyer
2023-06-12  1:10               ` Felix Lechner via Development of GNU Guix and the GNU System distribution.
2023-06-12 12:22                 ` Maxim Cournoyer
2023-06-12 13:13                 ` Andreas Enge
2023-06-12 13:47                   ` Maxim Cournoyer
2023-06-13  2:07               ` Leo Famulari
2023-06-14  1:32                 ` Maxim Cournoyer
2023-06-20 17:15                   ` Giovanni Biscuolo
2023-06-20 20:39                     ` Maxim Cournoyer
2023-06-21  7:36                       ` Josselin Poiret
2023-06-26 13:26                         ` Maxim Cournoyer
2023-06-20 16:32                 ` Giovanni Biscuolo
2023-06-11  9:25       ` 01/03: gnu: wxwidgets: Add libxtst to inputs Christopher Baines
2023-06-11 21:20         ` Maxim Cournoyer

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://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAFHYt54ZcV8xEekiRvxHTo2mMbBSepreCtz4TH=X_EqucNYi4Q@mail.gmail.com' \
    --to=guix-devel@gnu.org \
    --cc=andreas@enge.fr \
    --cc=felix.lechner@lease-up.com \
    --cc=mail@cbaines.net \
    --cc=maxim.cournoyer@gmail.com \
    /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/guix.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).