From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Vollmert Subject: merging or rebasing for wip- branches? Date: Wed, 31 Jul 2019 16:54:18 +0200 Message-ID: <90DEE165-4011-4EBC-B44B-3C31E3364550@vllmrt.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: Received: from eggs.gnu.org ([2001:470:142:3::10]:47978) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hspzq-00004x-5Q for guix-devel@gnu.org; Wed, 31 Jul 2019 10:54:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hspzp-0001IE-CJ for guix-devel@gnu.org; Wed, 31 Jul 2019 10:54:30 -0400 Received: from mx1.mailbox.org ([2001:67c:2050:104:0:1:25:1]:12834) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hspzp-0001HI-6h for guix-devel@gnu.org; Wed, 31 Jul 2019 10:54:29 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id E393D5271B for ; Wed, 31 Jul 2019 16:54:23 +0200 (CEST) Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id j1DqtCe9oonr for ; Wed, 31 Jul 2019 16:54:20 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Hi, 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? Cheers Robert