How to manually resolve a merge conflict in a sqlproj file in Visual Studio/VSTS/Git?
Refer to these steps to resolve conflicts:
- Open Branches in Team Explorer
- Double click the target branch to switch branch (e.g. master)
- Right click the target branch=> Pull
- Double click the source branch to switch branch (e.g. dev)
- Click Merge
- Choose master in Merge from branch and choose dev in Into current branch
- Click Merge
- Click Conflicts link=>Select the file=>Click Merge
- Resolve conflicts
- Click Commit Merge in Team Explorer
- Commit and push dev changes to remote branch
- Complete the pull request