gnunet-developers
[Top][All Lists]
Advanced

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

Re: Rebase merge conflicts


From: Willow Liquorice
Subject: Re: Rebase merge conflicts
Date: Mon, 3 Oct 2022 13:17:22 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0

Ok, that was the only tricky merge conflict. I'll push my changes now.

Best wishes,
        Willow

On 03/10/2022 13:13, Martin Schanzenbach wrote:
Yes. It was removed recently. If your rebase fails, feel free to just
merge.
It is not as pretty (in the logs), but possibly more painless.

Br
Martin

Excerpts from Willow Liquorice's message of 2022-10-03 13:02:29 +0100:
Hello,

I'm currently rebasing a load of changes to the Doxygen, and I've ran
into a merge conflict that I can't disentangle:
GNUNET_GNSRECORD_convert_records_for_export is present on my branch but
not on master. Was it removed?

Best wishes,
     Willow



reply via email to

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