Bug#1059388: git-debrebase: found two-parent merge, how to cope?

2023-12-24 Thread Ian Jackson
Hi. I'm going to reply off the cuff in the hope of getting you unstuck. If this email doesn't nsuffice I'll take a look at your git branch. So please let me know how you get on. Philipp Kern writes ("Bug#1059388: git-debrebase: found two-parent merge, how to cope?"): > I

Bug#1059388: git-debrebase: found two-parent merge, how to cope?

2023-12-24 Thread Philipp Kern
Package: dgit Version: 11.5 Severity: wishlist X-Debbugs-Cc: pk...@debian.org Hey, In the absence of a better venue of asking this question (there seems to be no mailing list): I have an upstream repository that contains a two-parent merge for some reason (https://github.com/twosigma/nsncd, of