guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2


From: Hartmut Goebel
Subject: [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2
Date: Mon, 30 Nov 2020 09:21:50 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0

Hi Christopher,

Am 28.11.20 um 14:26 schrieb Christopher Baines:
It won't. However, if two commits change the same place in a file, Git
can't always work out what to do. For example, two packages get added in
roughly the same spot.

I still don't get your point. Merge conflicts are business as usual and I will of course handle them when applying the patches.

Do you want me to send a new patch-set?

--
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |






reply via email to

[Prev in Thread] Current Thread [Next in Thread]