From: Leo Famulari <leo@famulari.name>
To: Christopher Baines <mail@cbaines.net>
Cc: guix-devel@gnu.org
Subject: Re: Branch management, wip-ppc64le, and POWER9
Date: Thu, 4 Feb 2021 13:53:37 -0500 [thread overview]
Message-ID: <YBxCsUzA9CvKL1Z+@jasmine.lan> (raw)
In-Reply-To: <877dnoyxy4.fsf@cbaines.net>
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
On Thu, Feb 04, 2021 at 09:38:43AM +0000, Christopher Baines wrote:
> > Specifically, I'm curious to know:
> >
> > - Is it usually expected that wip branches can be rebased? I don't plan
> > to rebase wip-ppc64le, since I'd like to be able to coordinate with
> > others using this branch, but I'm not sure what others expect.
>
> I think rebasing introduces issues with commit signatures, since you'd
> then be signing others commits. If multiple people are committing to the
> branch, I'd treat it like staging/core-updates, and merge rather than
> rebasing.
The signatures will be lost, but for "wip-" branches the expectation has
always been that history may be rewritten. For me, rebasing is a more
comfortable workflow for this kind of exploratory branch. I recommend
against using merges here.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-02-04 19:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 8:56 Branch management, wip-ppc64le, and POWER9 Chris Marusich
2021-02-04 9:38 ` Christopher Baines
2021-02-04 18:53 ` Leo Famulari [this message]
2021-02-04 18:57 ` Leo Famulari
2021-02-07 3:04 ` Chris Marusich
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=YBxCsUzA9CvKL1Z+@jasmine.lan \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
--cc=mail@cbaines.net \
/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).