Re: Rebase merge conflicts
Martin Schanzenbach <[email protected]>
| Newsgroups | gmane.network.gnunet.devel |
|---|---|
| Message-ID | <1664799151-sup-8168@werkbank> |
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)
-----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEPREGPBD5jRS9JNFHCwmY74b1m2oFAmM60doACgkQCwmY74b1 m2rbDg/+JEBVBHA4emENbUBnsIN0cmP1L/lxNVWkAzqkUbweBVwpOzugcvtXYmpu kRPU73/Nt016+lwjjvNRaNHv9n20xwap+3243luRl7vY+rOtjFKJuXcHd79s+YWp dfnITmM7XO7KkgVGzZk9bugKrv806BHQkY1JuQTTci1yedDom68U5fzpjAD3E8n0 7o0Pb16aFsSnN6euwyDUNTB3d5zX8t+sOua1RmF1Kt8QpVpGxMtkZ1X6Riw4fE17 xf7SDxTq+24pjI2wSRDajhTLR/cI/AqIHofaXJoVOM1Z3RAMs3KVm8SLORNQOinY Np8jJsUJWrVsqhDM+wK0L1HztKgaQjDM0OUHxvIj4cZFYNgvVdl7z/jouHZ8W2HN FCuV9dYFeqIzIklvNgm89ARRt7DvZljYKu/YnCgJgJ5zuPihZydKB1qyRlucHgQC u+1LaoFVEEE09pcNzkJHbCFP09wP7mxbzbs8EyblDPSLEKwuJ8QagsvNpdotDZmD YywerfLBpLPT44fNTJfc5ctmtREi5EEkKuB3zPZfKy2hw88zuJbV46SqNRV8YCm3 cDimRh7padmGE6FheBDlc2qGQ+XqGrfch4XiYOTxSqVThevrthE08/Odre4pioGM Kxv1uHZdkXslKXAA/jxCKvTYe4A6WhUdMBCnq7/ZwmhqGaQ2DcM= =eDP7 -----END PGP SIGNATURE-----