How to manually resolve a merge conflict in a sqlproj file in Visual Studio/VSTS/Git?

Refer to these steps to resolve conflicts:

1. Open Branches in Team Explorer
2. Double click the target branch to switch branch (e.g. master)
3. Right click the target branch=> Pull
4. Double click the source branch to switch branch (e.g. dev)
5. Click Merge
6. Choose master in Merge from branch and choose dev in Into current branch
7. Click Merge
8. Click Conflicts link=>Select the file=>Click Merge
9. Resolve conflicts
10. Click Commit Merge in Team Explorer
11. Commit and push dev changes to remote branch
12. Complete the pull request