Git Automatically Resolve Conflicts

$ git merge -Xours branch-name
$ git merge -XTheirs banch-name

Comes in really handy for sweeping updates, like running lint on the entire code base or merging package-lock.json.

Leave a Reply

Your email address will not be published. Required fields are marked *