'Resolve Merge Conflict

I need help in resolving merge conflict in git pull from GitHub, I did the following on my current branch, I did the following. Development is a branch where all our team members push code and we pull code.

git pull origin development

merge-conflict-resolution

Sources

This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.

Source: Stack Overflow

Solution	Source

'Resolve Merge Conflict

Sources

Related Questions