Resolve Conflicts Using the Git Panel
Use the Git Panel to review and resolve conflicts that occur when your changes clash with those made by other project members.
Conflicts usually occur when you and your teammate change the same line in different ways, or if one of you deleted a file while the other modified it. In such cases, VB Studio cannot tell which version is correct—it's up to you or your teammate to make that decision and resolve the conflict.
Note:
To help minimize the number of conflicts, the best practice is to make sure your local branch and the remote branch are in sync and up-to-date. You do this by frequently pulling commits on the remote branch to your local branch and by pushing changes from your workspace to the remote branch.You'll be informed of conflicts when you attempt to merge or pull commits into your workspace. For example, let's say you've changed lines 2 and 3 in readme.md
and committed the changes to a local branch in your Git repo. Now if someone else modified the same lines in readme.md
and committed the changes to a remote branch, you'll be warned of conflicts between the file's remote version and your local version when you do a pull request to refresh your workspace, as shown here:
Description of the illustration showconflicts.png
When this happens, here's what to do: