Git Merge conflicts resolution made easy
It’s the end of the day. You just finished some important work in your git feature branch. Your code is working beautifully. Unit tests are passing. Code reviewers approved. All is green. Time to merge!
Automatic merge failed; fix…