From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jan <tona_kosmicznego_smiecia@interia.pl>
Subject: Re: Packaging Jami "progress"
Date: Wed, 8 Apr 2020 00:51:25 +0200
Message-ID: <20200408005125.3a18c09b@kompiuter>
References: <20200406183556.560f8e62@kompiuter>
 <87o8s4o4gz.fsf@devup.no>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:33085)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <tona_kosmicznego_smiecia@interia.pl>)
 id 1jLx4L-0000BO-3Y
 for guix-devel@gnu.org; Tue, 07 Apr 2020 18:51:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <tona_kosmicznego_smiecia@interia.pl>)
 id 1jLx4K-0000uT-27
 for guix-devel@gnu.org; Tue, 07 Apr 2020 18:51:44 -0400
Received: from smtpo.poczta.interia.pl ([217.74.65.233]:43306)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <tona_kosmicznego_smiecia@interia.pl>)
 id 1jLx4J-0000r5-Fc
 for guix-devel@gnu.org; Tue, 07 Apr 2020 18:51:44 -0400
In-Reply-To: <87o8s4o4gz.fsf@devup.no>
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-mx.org@gnu.org
Sender: "Guix-devel"
 <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
To: Marius Bakke <mbakke@fastmail.com>
Cc: guix-devel@gnu.org

I get several merge conflicts when merging wip-jami into core updates.
The wip-jami is based on the current master, rebased a minute ago.
Is there a way to avoid this without pain?


Jan Wielkiewicz