Closed rindeal closed 4 years ago
Hi, thanks for your patches! I think I had merged in the wrong order... Is this straightforward to resolve on your side?
Yeah, I should have made a note about that dependency in the PR. Anyway the fix was straightforward:
git rebase -s recursive -X ours master
Hi, thanks for your patches! I think I had merged in the wrong order... Is this straightforward to resolve on your side?