From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marius Bakke <mbakke@fastmail.com>
Subject: Re: Packaging Jami "progress"
Date: Wed, 08 Apr 2020 01:06:14 +0200
Message-ID: <877dyqlwux.fsf@devup.no>
References: <20200406183556.560f8e62@kompiuter> <87o8s4o4gz.fsf@devup.no>
 <20200408005125.3a18c09b@kompiuter>
Mime-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:53589)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <mbakke@fastmail.com>) id 1jLxIU-0003Ts-DU
 for guix-devel@gnu.org; Tue, 07 Apr 2020 19:06:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <mbakke@fastmail.com>) id 1jLxIS-000165-Ox
 for guix-devel@gnu.org; Tue, 07 Apr 2020 19:06:22 -0400
Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:40593)
 by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <mbakke@fastmail.com>) id 1jLxIS-00015O-D9
 for guix-devel@gnu.org; Tue, 07 Apr 2020 19:06:20 -0400
In-Reply-To: <20200408005125.3a18c09b@kompiuter>
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: Jan <tona_kosmicznego_smiecia@interia.pl>
Cc: guix-devel@gnu.org

--=-=-=
Content-Type: text/plain

Jan <tona_kosmicznego_smiecia@interia.pl> writes:

> 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?

A git merge will merge all the commits, some of which are bound to cause
conflicts.  I will try to resolve those tomorrow.

In the mean time, you should be able to "cherry-pick" your patches
instead.  Something along the lines of:

$ git checkout core-updates
$ git cherry-pick master..wip-jami

Does that work?

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6NB2cACgkQoqBt8qM6
VPow2wf+PF2OLx2MM03tqeG0OAta3aB2y+VfDmk4aoJtiujMleUJUe1dsIRpSOPx
B+MfY41S2hKlKT8JtipFvbw9WAILgeCZAjZ1OeA87PBe2rmJ2j9AeQV2fJ2QaHMx
IIM327pWJQdLMr8TX75zgLGSMSnEAD0vUCVHYRJXkMExJGTixlZAHzqL5QLqnnbY
nwuv7+ljhzNbP7434rYYtpaX43R/ZEXFLSqlkfuNmMgLKA5kFm5oDwQqnx2WYfdN
ynSHExgz8O/MPQcfRqjtx4L7y2JUeYErQlvXn0xR4UO1T/O7GqojFurgSk6bASmu
csl5d/pKwNHUfirbXbA3QFACgtk/oQ==
=qB40
-----END PGP SIGNATURE-----
--=-=-=--