The right way to resolve merge conflict in git

Hey there again!

Well I’ve decided to publish a lil’ article about the way I’m resolving any merge conflicts that could occur after «git pull», cherry-pick or something like that.

Internet says that you have to see and manually edit the conflicted file but this is not how I prefer to do it. First of all let’s choose the right version of conflicted file: remote or local one.

So next all we need is:

or

Finish that flow by using «git add <path>» and then «git commit».

Hope this will help you!

P.S. Yep, last days I like to use «flow» and «workflow» in any convenient case, don’t blame me please :)