From: Marius Bakke <mbakke@fastmail.com>
To: Jan <tona_kosmicznego_smiecia@interia.pl>
Cc: guix-devel@gnu.org
Subject: Re: Packaging Jami "progress"
Date: Wed, 08 Apr 2020 01:06:14 +0200 [thread overview]
Message-ID: <877dyqlwux.fsf@devup.no> (raw)
In-Reply-To: <20200408005125.3a18c09b@kompiuter>
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
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?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2020-04-07 23:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 16:35 Packaging Jami "progress" Jan
2020-04-06 18:26 ` Marius Bakke
2020-04-06 18:51 ` Jan
2020-04-07 22:51 ` Jan
2020-04-07 23:06 ` Marius Bakke [this message]
2020-04-07 23:52 ` Jan
2020-04-08 0:34 ` Leo Famulari
2020-04-08 0:39 ` Jan
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877dyqlwux.fsf@devup.no \
--to=mbakke@fastmail.com \
--cc=guix-devel@gnu.org \
--cc=tona_kosmicznego_smiecia@interia.pl \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).