How to handle merge conflicts with git

Even though there is enough documentation about this topic on the internet, often the topic of resolving merge conflicts becomes a white elephant that everyone talks about but does not how to do well. So here is a video that explains exactly how it is done —

I came to know about this via FB, shared by good friend Rajmahendra Hegde –


About vatsalad

Hi, I'm Vatsala
This entry was posted in How To.... Bookmark the permalink.