I use GitKraken which is hooked up to git, and the gui makes it easy to handle merge conflicts. you pull in other peoples changes, and if there's a conflicts, it will tell you and you can pick and choose what you want to resolve the merge conflict. I actually don't know anyone who resolves conflicts without some kind of gui.
the symbols "====", ">>>>", "<<<<" tell you where the head and the conflict is.
I use GitKraken which is hooked up to git, and the gui makes it easy to handle merge conflicts. you pull in other peoples changes, and if there's a conflicts, it will tell you and you can pick and choose what you want to resolve the merge conflict. I actually don't know anyone who resolves conflicts without some kind of gui.
the symbols "====", ">>>>", "<<<<" tell you where the head and the conflict is.
I did find this on google, though
rollout.io/blog/resolve-github-mer...