Sometimes when resolving a merge conflict, you may want to keep one file instead of the other. You donât need to open up the files and fix potentially hundreds of conflicts; you just want to choose the one you want and be done with it. Unfortunately, this wasnât exactly straightforward in older versions of Git, but more recent versions have made it easier. Big thanks to Kevin Old for his post on t
{{#tags}}- {{label}}
{{/tags}}