From: Robert Vollmert <rob@vllmrt.net>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: guix-devel@gnu.org
Subject: Re: merging or rebasing for wip- branches?
Date: Wed, 31 Jul 2019 17:54:32 +0200 [thread overview]
Message-ID: <21003934-CB7B-4AFF-B765-534B06B0A2BF@vllmrt.net> (raw)
In-Reply-To: <87pnlqteax.fsf@elephly.net>
> On 31. Jul 2019, at 17:27, Ricardo Wurmus <rekado@elephly.net> wrote:
>
>> I’ve been working on some patches on the wip-haskell-updates branch. For now,
>> I’ve been making new commits, and occasionally merging master, not least
>> because forced push is rejected. But this makes the branch more messy than
>> necessary — do you generally not rebase the wip-branches, or if not, could I
>> be allowed to force-push to that branch?
>
> You can delete the branch and then re-create it. That’s equivalent to a
> force push and that’s totally fine for wip-* branches. (Not so
> convenient, but I don’t know if we can relax the force push restriction
> easily.)
>
> We only merge master into wip branches when we’ve already built the
> branch and we just want to touch it up a little without invalidating
> most of the builds.
Alright, thanks! That works for me.
prev parent reply other threads:[~2019-07-31 15:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-31 14:54 merging or rebasing for wip- branches? Robert Vollmert
2019-07-31 15:27 ` Ricardo Wurmus
2019-07-31 15:54 ` Robert Vollmert [this message]
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=21003934-CB7B-4AFF-B765-534B06B0A2BF@vllmrt.net \
--to=rob@vllmrt.net \
--cc=guix-devel@gnu.org \
--cc=rekado@elephly.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).