From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre Neidhardt Subject: Re: Packaging Jami progress Date: Sat, 30 Nov 2019 19:38:38 +0100 Message-ID: <87fti52or5.fsf@ambrevar.xyz> References: <20191104214754.793ec2ff@interia.pl> <877e4bo646.fsf@ambrevar.xyz> <20191107204757.23dd08de@interia.pl> <874kzfo21r.fsf@ambrevar.xyz> <20191108192542.5daa7a0a@interia.pl> <87zhh2kdt2.fsf@ambrevar.xyz> <20191111111423.66ec31d5@interia.pl> <87r22ek7x4.fsf@ambrevar.xyz> <874kzajvy9.fsf@ambrevar.xyz> <20191111163843.0629ef41@kompiuter> <87o8xe4d5m.fsf@ambrevar.xyz> <87eeya49hf.fsf@ambrevar.xyz> <20191114214010.7b61005f@kompiuter> <87lfsikttk.fsf@ambrevar.xyz> <20191114231605.0ecec870@kompiuter> <87a797o6hb.fsf@ambrevar.xyz> <20191125221517.1140d0c9@kompiuter> <874kyrlzmn.fsf@ambrevar.xyz> <20191126203259.0f4141ea@kompiuter> <20191130192121.11e0c968@kompiuter> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:46057) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ib7dk-0003Wl-CH for guix-devel@gnu.org; Sat, 30 Nov 2019 13:38:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ib7di-00027l-Js for guix-devel@gnu.org; Sat, 30 Nov 2019 13:38:43 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:53623) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ib7di-00026T-D2 for guix-devel@gnu.org; Sat, 30 Nov 2019 13:38:42 -0500 In-Reply-To: <20191130192121.11e0c968@kompiuter> 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: Jan , zimoun Cc: Guix-devel --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Jan writes: >> Note that the series will not apply with a fresh "git pull" because >> there a conflict with the file cpp.scm. You need to rebase, as I asked >> to Pierre. ;-) > Rebase? Should I use a different checkout? Sorry, but this git thing > is still a dark magic for me.=20 "Rebasing" means "reapply some changes on top of a new commit." It's an important concept to synchronize changes when working with multiple people. The (1)git-rebase man page has some good examples with the drawings, this could be helpful to understand how it works. If you don't want to use Emacs and Magit, the man page will give you the right command line invocation to rebase your branch onto master. If you decide to go with Emacs and Magit (possibly the easiest way), you can "rebase the onto master". This should trigger a conflict, which you can then resolve by pressing "e" (ediff) on the unmerged (i.e. conflicting) changes. Hope this helps! =2D-=20 Pierre Neidhardt https://ambrevar.xyz/ --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl3ity4ACgkQm9z0l6S7 zH8k+Af/RVTKIGif7KaQmR/6l3lTCLfXtrqKhJou4Zt3vmeyoY7yT6QUS+88VbHA swq+liFYT+gIegL1O/DMHV8ya6B5K6OKFMdkrqdHchTEluFOxBcdiP4RAmBu0s8w DDfhKGYgKYgQln71QYywqcAApeomR+8edd1MGj8Ewd2E5bo62WLpp7XOUmIdlX9v 4RHBjPvktYoh3IOqUmhrH0Ok/c7SLqZKu6X4iC7yZR/2IkF+Rkgqbp/1JfnH/tnR Bu9fUm0sWLBZFd0rpk+jKmnrY27bmUdkXvJRXogaMHfmcWKfqB/lGAeNOmL94N6r +SnFrWTS/u21MC7xAhtOlvxLVciPjw== =PNfh -----END PGP SIGNATURE----- --=-=-=--