Keep Your Local and Remote Branches in Sync to Avoid Conflicts

If you and a team member are working together on a visual application, you will be using the same Git repository and might be working off the same branch and editing the same files. This can sometimes result in a code conflict.

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. Typically, you make changes in a branch private to your workspace, then publish them to a shared branch in your remote repository, so your changes become available to others. To include others' changes in your workspace, you must keep your local branch in sync with the remote branch by merging changes from that remote branch into your workspace.

Tip:

VB Studio simplifies the task of keeping your workspace up-to-date by periodically checking your project's remote repository for updates and notifying you when your workspace needs to be refreshed with changes. Simply click the Refresh Workspace link in the notification to update your workspace. See Refresh Your Workspace.

If a code conflict occurs, you'll have to resolve it before you can update the branch with your changes.