From: Jan <tona_kosmicznego_smiecia@interia.pl>
To: Marius Bakke <mbakke@fastmail.com>
Cc: guix-devel@gnu.org
Subject: Re: Packaging Jami "progress"
Date: Wed, 8 Apr 2020 01:52:14 +0200 [thread overview]
Message-ID: <20200408015203.30acce08@kompiuter> (raw)
In-Reply-To: <877dyqlwux.fsf@devup.no>
On Wed, 08 Apr 2020 01:06:14 +0200
Marius Bakke <mbakke@fastmail.com> wrote:
> 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?
I'm currently hacking it together using "git format-patch" and "git
am" and it seems to work. I'll compile Jami and check if the bug is
present.
Will remember about this cherry-pick thing, because resolving failing
patches wasn't fun, thanks.
If it succeeds, I will need a way to copy contents of the store on my
powerful machine to my potato machine. Is "guix copy" the tool I can
use?
Jan Wielkiewicz
next prev parent reply other threads:[~2020-04-07 23:52 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
2020-04-07 23:52 ` Jan [this message]
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=20200408015203.30acce08@kompiuter \
--to=tona_kosmicznego_smiecia@interia.pl \
--cc=guix-devel@gnu.org \
--cc=mbakke@fastmail.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 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).