Fixing Git Merge Conflicts

Git merge conflicts can be an absolute pain. Sometimes despite your best efforts you end up with conflicts when you create a Pull Request (PR) with your new feature. Just when you think you have finished with the current Product Backlog Item you have to go back and fix conflicts. It is a common issue especially with larger development teams where there can be several PRs a day. In this article we will have a look at how to best avoid getting…