On Mon, Dec 6, 2021 at 3:31 AM Stefan Sperling <s...@elego.de> wrote: > > Thanks, Nathan. I see this is in the conflict resolver so this is probably > code I have written. But I won't snag this away from you. And if you need > any help, just let me know. (I have not yet looked into details; I suspect > that right_source might be bogus or simply invalid?)
Thanks. I'm sure I will have questions soon! Not sure yet whether right_source is bogus. I have a thought I'll test tomorrow. It's getting late here so calling it a day for now, but I've been having fun single-stepping through this merge invocation. Once I identify what is unusual about this scenario, I'll try to reproduce it in a regression test using the standard Greek tree if possible; if not, then I'll fall back to just running the same steps as the repro. I'll know more soon... Cheers, Nathan
