From: Pierre Neidhardt <mail@ambrevar.xyz>
To: Jan <tona_kosmicznego_smiecia@interia.pl>,
zimoun <zimon.toutoune@gmail.com>
Cc: Guix-devel <guix-devel@gnu.org>
Subject: Re: Packaging Jami progress
Date: Sat, 30 Nov 2019 19:38:38 +0100 [thread overview]
Message-ID: <87fti52or5.fsf@ambrevar.xyz> (raw)
In-Reply-To: <20191130192121.11e0c968@kompiuter>
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
Jan <tona_kosmicznego_smiecia@interia.pl> 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.
"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 <branch> 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!
--
Pierre Neidhardt
https://ambrevar.xyz/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2019-11-30 18:38 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 20:47 Packaging Jami progress Jan Wielkiewicz
2019-11-04 22:48 ` Gábor Boskovits
2019-11-05 16:50 ` Jan Wielkiewicz
2019-11-05 17:31 ` Gábor Boskovits
2019-11-06 10:30 ` Pierre Neidhardt
2019-11-06 16:24 ` Jan Wielkiewicz
2019-11-06 17:07 ` Pierre Neidhardt
2019-11-07 19:02 ` Pierre Neidhardt
2019-11-07 19:55 ` Jan Wielkiewicz
2019-11-25 21:15 ` Jan
2019-11-26 10:07 ` Pierre Neidhardt
2019-11-26 19:33 ` Jan
2019-11-26 20:12 ` Pierre Neidhardt
2019-11-27 11:43 ` zimoun
2019-11-30 18:21 ` Jan
2019-11-30 18:38 ` Pierre Neidhardt [this message]
2019-12-01 16:34 ` Jan
2019-12-01 17:32 ` Pierre Neidhardt
2019-12-01 18:25 ` Jan
2019-12-03 15:44 ` Jan Wielkiewicz
2019-12-03 16:04 ` Pierre Neidhardt
2019-12-03 18:02 ` Jan
2019-12-03 18:37 ` Pierre Neidhardt
2019-12-03 18:38 ` Pierre Neidhardt
2019-12-04 14:36 ` Jan Wielkiewicz
2019-12-04 15:27 ` Pierre Neidhardt
2019-12-04 15:50 ` Jan Wielkiewicz
2019-12-04 16:06 ` Pierre Neidhardt
2019-12-04 16:56 ` Jan
2019-12-04 17:01 ` Pierre Neidhardt
2019-12-04 17:22 ` Jan Wielkiewicz
2019-12-05 14:32 ` Pierre Neidhardt
2019-12-05 16:00 ` Jan
2019-12-05 16:28 ` Pierre Neidhardt
2019-12-09 22:17 ` Jan Wielkiewicz
2019-12-10 8:57 ` Pierre Neidhardt
2019-12-10 9:59 ` Caleb Ristvedt
2019-12-10 10:45 ` Pierre Neidhardt
2019-12-10 22:56 ` Jan Wielkiewicz
2019-12-11 0:43 ` Caleb Ristvedt
2019-12-11 16:33 ` Jan
2019-11-26 16:43 ` zimoun
2019-11-26 19:14 ` Pierre Neidhardt
2019-11-07 19:10 ` Pierre Neidhardt
2019-11-07 19:47 ` Jan Wielkiewicz
2019-11-07 20:37 ` Pierre Neidhardt
2019-11-08 18:25 ` Jan Wielkiewicz
2019-11-11 8:38 ` Pierre Neidhardt
2019-11-11 10:14 ` Jan Wielkiewicz
2019-11-11 10:45 ` Pierre Neidhardt
2019-11-11 15:04 ` Pierre Neidhardt
2019-11-11 15:38 ` Jan
2019-11-14 16:48 ` Pierre Neidhardt
2019-11-14 18:07 ` Pierre Neidhardt
2019-11-14 20:40 ` Jan
2019-11-14 21:54 ` Pierre Neidhardt
2019-11-14 22:16 ` Jan
2019-11-15 9:07 ` Pierre Neidhardt
2019-11-16 12:48 ` Jan
-- strict thread matches above, loose matches on Subject: below --
2019-12-15 20:12 Jan Wielkiewicz
2019-12-15 21:46 ` Ricardo Wurmus
2019-12-15 23:33 ` Jan Wielkiewicz
2019-12-21 23:28 ` Jan Wielkiewicz
2019-12-22 7:48 ` Ricardo Wurmus
2019-12-23 19:43 ` Jan
2019-12-25 1:34 ` Jan
2019-12-25 9:08 ` Efraim Flashner
2019-12-27 18:57 ` Jan Wielkiewicz
2019-12-27 20:32 ` Gábor Boskovits
2019-12-27 21:46 ` Jan Wielkiewicz
2019-12-28 9:40 ` Pierre Neidhardt
2019-12-28 11:57 ` Jan
2020-01-03 6:35 ` Ricardo Wurmus
2020-01-01 15:22 ` Jan
2020-01-03 6:33 ` Ricardo Wurmus
2020-01-04 0:13 ` Jan
2020-01-04 15:37 ` Pierre Neidhardt
2020-01-06 1:49 ` Jan
2020-01-06 18:23 ` Jan
2020-01-06 19:49 ` Jack Hill
2020-01-06 22:40 ` zimoun
2020-01-07 7:48 ` Pierre Neidhardt
2019-12-28 1:34 ` Jan Wielkiewicz
2019-12-28 9:53 ` Pierre Neidhardt
2019-12-28 12:00 ` Jan
2019-12-15 21:47 ` Jan Wielkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fti52or5.fsf@ambrevar.xyz \
--to=mail@ambrevar.xyz \
--cc=guix-devel@gnu.org \
--cc=tona_kosmicznego_smiecia@interia.pl \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.