Re: Rebase merge conflicts

Martin Schanzenbach <[email protected]> Mon, 03 Oct 2022 12:29:41 +0000

Newsgroups	gmane.network.gnunet.devel
Message-ID	<1664800165-sup-7514@werkbank>

Feel free to merge+push into master whenever.

Excerpts from Willow Liquorice's message of 2022-10-03 13:17:22 +0100:
> 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

signature.asc (application/pgp-signature, 833 B)