David Bremner writes ("Re: Bug#1116600: git-debrebase: new-upstream failure"):
> Same error message from "git debrebase quick"Thanks. I've got quite a way with diagnosis. I think I have produced a working branch for you, which I made into an MR here: https://salsa.debian.org/emacsen-team/circe/-/merge_requests/3 Like I say there, please take a look at the branch and seen if it LGTY. There is a risk that if you "merge" that with gitlab, that git-debrebase will then be confused by the gitlab-generated merge. I would be interested to know the results. (If it does go wrong we will be able to fix it.) If you prefer not to experiment, you can git merge --ff-only that branch into your local tree, and push it to master. I don't have a properly tidied up version of the new code yet. First I need to convince myself that my ad-hoc adjustment, that produced the output I've giving to you now, is correct. Ian. -- Ian Jackson <[email protected]> These opinions are my own. Pronouns: they/he. If I emailed you from @fyvzl.net or @evade.org.uk, that is a private address which bypasses my fierce spamfilter.
