Tips and Advice for Dealing with Merge Conflicts
I was lying in bed this morning planning the best way to handle a merge conflict I know is coming with a colleague’s PR today, and I realized I’d like to know a couple of tricks for certain situations. Here they are: