Mastering Merge Conflicts

A Guide to Resolving Conflicts in Git

Managing any Version Control System can be troublesome, especially if developers are unaware of working in same files on different branches conflicts are unavoidable. When you start working in a huge project where multiple developers are involved to reduce the occurrence of such an event branches are created and we use git merge command.

GitHub Desktop

If your not an expert with Git using GitHub Desktop GUI may be a good starting fit of solving your merge conflicts faster compared to traditional CLI.

Here I used GitHub Desktop

While trying to merge it will show the merge conflict and will promt you to choose either fix the conflict on terminal or VSCode(what most people usually choose). You may come around something like this. 👇

Accept both not recommended btw 😉

CLI(Command line interface)

The CLI is the most well known and straightforward method to resolve conflicts.