Solve merge conflicts in Git

Identify which files are in conflict (Git should tell you this).
Open each file and examine the diffs; Git demarcates them. Hopefully it will be obvious which version of each block to keep. You may need to discuss it with fellow developers who committed the code.
Once you’ve resolved the conflict in the files stage them:

git add .

do a commit:

git commit -m "solved merge conflict"
git push

Add your comment