From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ricardo Wurmus <rekado@elephly.net>
Subject: Re: merging or rebasing for wip- branches?
Date: Wed, 31 Jul 2019 17:27:18 +0200
Message-ID: <87pnlqteax.fsf@elephly.net>
References: <90DEE165-4011-4EBC-B44B-3C31E3364550@vllmrt.net>
Mime-Version: 1.0
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]:55892)
 by lists.gnu.org with esmtp (Exim 4.86_2)
 (envelope-from <rekado@elephly.net>) id 1hsqVj-0000XG-DN
 for guix-devel@gnu.org; Wed, 31 Jul 2019 11:27:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <rekado@elephly.net>) id 1hsqVi-0005SO-GE
 for guix-devel@gnu.org; Wed, 31 Jul 2019 11:27:27 -0400
Received: from sender-of-o51.zoho.com ([135.84.80.216]:21273)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <rekado@elephly.net>) id 1hsqVi-0005Rh-8A
 for guix-devel@gnu.org; Wed, 31 Jul 2019 11:27:26 -0400
In-reply-to: <90DEE165-4011-4EBC-B44B-3C31E3364550@vllmrt.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: Robert Vollmert <rob@vllmrt.net>
Cc: guix-devel@gnu.org


Hi Robert,

> I=E2=80=99ve been working on some patches on the wip-haskell-updates bran=
ch. For now,
> I=E2=80=99ve been making new commits, and occasionally merging master, no=
t 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 n=
ot, could I
> be allowed to force-push to that branch?

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 restric=
tion
easily.)

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.

--
Ricardo