@thisismissem If your PR addresses problems his PR won't, is it possible to restructure your PR in a way it improves things without causing conflict, on top of his changes? (It will probably be more work to do so, so if you don't want to do that, I think that's fair, though.)
@thisismissem @pot don’t waste your time trying to appease this behaviour, you’ll always be jumping through hoops. Sorry you’ve been treated this way.
@pot the conflicts would be so large and my work has existed well before his. I'm happy to take things back from his into mine or rebase the bits that I can, and I'd already offered that on the first instance of a conflicting PR, then he turned around and worked on an issue I'd literally told him that morning that I'd been working on & needed input from the team.