Version control

Use version control to track project changes. Workspace changes are saved automatically and you can commit them to the project history. To share committed changes with your peers, you must push them to the remote repository.

If someone pushes changes to the remote repository while you have local changes in your workspace, you will have to pull those remote changes into your workspace before you can push. If there are conflicts between your changes and what is in the remote repository, the

Merge conflict

dialog appears. The dialog lists the files containing conflicts, the number of unresolved conflicts in each file, and the total number of unresolved conflicts.

Use the

Merge conflict

dialog to choose how to resolve conflicts. Choose one of these options to resolve a conflict:

Accept local changes
. Accepting local changes keeps the changes you made in your local workspace and deletes those coming from the remote repository.
Accept remote changes
. Accepting remote changes keeps those coming coming from the remote repository and deletes the changes made in your local workspace.
Accept both changes
. Accepting both changes merges changes from your local workspace and the remote repository.

Use the

Change history

tab on the Merge conflict dialog to see a record of all project changes. You can view the details of each commit, compare changes, and restore back to a previous version.

The project status appears in the lower right corner. The status indicates whether your project is synchronized with the remote repository.

After you complete a merge, you can push your changes to the remote repository. The commit, push, and pull actions in the toolbar are enabled and indicate the number of commits available to push or pull.