[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Packaging Jami "progress"
|
From: |
Marius Bakke |
|
Subject: |
Re: Packaging Jami "progress" |
|
Date: |
Wed, 08 Apr 2020 01:06:14 +0200 |
|
User-agent: |
Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) |
Jan <address@hidden> 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?
signature.asc
Description: PGP signature