"I truly value our connection, and I hope my no doesn't change that." shows up 45 times.
Seems like most of the rejections appear between 30 and 50 times.
"I truly value our connection, and I hope my no doesn't change that." shows up 45 times.
Seems like most of the rejections appear between 30 and 50 times.
Maybe then this is really a request for Github to get better/smarter merge tools in the Web UI, particularly syntax-aware ones for structured files like JSON and YAML, where it would be much easier to guess, or even just preset AB and BA as the two concrete options available when both changes inserted new content at the same point. It could even read your .gitattributes file for supported mergers that would be able to telegraph "I don't care about the order" or "Order new list entries alphabetically" or whatever.
Not the way I'd approach it, but as a joke service, if it works it works.