On Fri, Aug 6, 2021 at 10:58 AM Dan Villiom Podlaski Christiansen
> Before I try to debug this, I wanted to ask a question: Did you try following the advice, and do an 'hg pull'? If not, could you explain why? Perhaps the message is unhelpful or misleading?
Eeks. Apologies if it sounded like it was a problem with the tools.
No, hg-git is working fine. I'm the one that messed up. The hope was
that perhaps someone else on the list had worked through an issue like
But yes, I did an hg pull which created two heads. The question was
more around if it is possible to combine the two histories and
slightly reorder them to reflect what I should have done in the first
place. The earlier advice about deleting the offending commits on
github is probably the easiest fix here.