If I’m gonna merge some shit that’ll probably have a bunch of conflicts, I’ll create a throwaway “test-merge” branch because I’ll inevitably fuck up the merge and even though I’ve used git for years I have no idea how to revert a merge andatthispointimafraidtoask.jpg