* merging or rebasing for wip- branches?
@ 2019-07-31 14:54 Robert Vollmert
2019-07-31 15:27 ` Ricardo Wurmus
0 siblings, 1 reply; 3+ messages in thread
From: Robert Vollmert @ 2019-07-31 14:54 UTC (permalink / raw)
To: guix-devel
Hi,
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?
Cheers
Robert
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: merging or rebasing for wip- branches?
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
0 siblings, 1 reply; 3+ messages in thread
From: Ricardo Wurmus @ 2019-07-31 15:27 UTC (permalink / raw)
To: Robert Vollmert; +Cc: guix-devel
Hi Robert,
> 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.
--
Ricardo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: merging or rebasing for wip- branches?
2019-07-31 15:27 ` Ricardo Wurmus
@ 2019-07-31 15:54 ` Robert Vollmert
0 siblings, 0 replies; 3+ messages in thread
From: Robert Vollmert @ 2019-07-31 15:54 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-31 15:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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).