Comment by Steven Ventimiglia on "What is the best approach to resolving merge conflicts?"

I feel that this is a simple and solid approach that's often overlooked:

Commit your code when anything is worth saving.
Do not push it yet. Instead, 'git pull origin master'.
If there is an existing conflict, it should be minor. Resolve it.
Then, commit with -m 'Resolved merge conflict'.
Then - again - 'git pull origin master' to guarantee you have the latest.
Rinse, repeat steps 3-5 until you get a clean pull.
Push your branch.

No matter how long the life of your branch is, it's now being bookmarked with local commits, and then merged with origin/master to avoid a future conflict (aka trainwreck.)

In my experience, Atom (Merge Conflict/Split Diff) and VS Code (GitLens) have nice packages/extensions for Git in general. I would always advise learning git via CLI vs a GUI, since pressing a button is way different from typing commands with the intention of accomplishing something specific.

Search Hashnode