From mboxrd@z Thu Jan  1 00:00:00 1970
From: Robert Vollmert <rob@vllmrt.net>
Subject: Re: merging or rebasing for wip- branches?
Date: Wed, 31 Jul 2019 17:54:32 +0200
Message-ID: <21003934-CB7B-4AFF-B765-534B06B0A2BF@vllmrt.net>
References: <90DEE165-4011-4EBC-B44B-3C31E3364550@vllmrt.net>
 <87pnlqteax.fsf@elephly.net>
Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\))
Content-Type: text/plain;
	charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:37013)
 by lists.gnu.org with esmtp (Exim 4.86_2)
 (envelope-from <rob@vllmrt.net>) id 1hsqwE-0007Ns-96
 for guix-devel@gnu.org; Wed, 31 Jul 2019 11:54:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <rob@vllmrt.net>) id 1hsqwD-0002yw-BL
 for guix-devel@gnu.org; Wed, 31 Jul 2019 11:54:50 -0400
Received: from mx2a.mailbox.org ([2001:67c:2050:104:0:2:25:2]:42696
 helo=mx2.mailbox.org)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <rob@vllmrt.net>) id 1hsqwD-0002wh-4u
 for guix-devel@gnu.org; Wed, 31 Jul 2019 11:54:49 -0400
In-Reply-To: <87pnlqteax.fsf@elephly.net>
List-Id: "Development of GNU Guix and the GNU System distribution."
 <guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: guix-devel@gnu.org



> On 31. Jul 2019, at 17:27, Ricardo Wurmus <rekado@elephly.net> wrote:
>=20
>> I=E2=80=99ve been working on some patches on the wip-haskell-updates =
branch. For now,
>> I=E2=80=99ve been making new commits, and occasionally merging =
master, not least
>> because forced push is rejected. But this makes the branch more messy =
than
>> necessary =E2=80=94 do you generally not rebase the wip-branches, or =
if not, could I
>> be allowed to force-push to that branch?
>=20
> You can delete the branch and then re-create it.  That=E2=80=99s =
equivalent to a
> force push and that=E2=80=99s totally fine for wip-* branches.  (Not =
so
> convenient, but I don=E2=80=99t know if we can relax the force push =
restriction
> easily.)
>=20
> We only merge master into wip branches when we=E2=80=99ve 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.