Working with Source Control Management (SCM)

1. Click the SCM button to open the SCM pane.

2. Click the Changes tab to see the changes that were made to the folders and files. Items that were modified, deleted, or added appear in distinct colors.

   

   • Green - indicates that a new item has been added to the project, locally.
   • Grey - indicates that an item has been removed from the project, locally.
   • Blue - indicates that an item has been edited.
   • Red - indicates that an item is in conflict.

Before starting to work, you must import the most recent changes from the repository to your workspace.

To import, complete the following steps:

1. Click the SCM button to open the SCM pane.
2. Click the Pull button to download the most recent changes to your workspace.

After you make changes locally, you must upload these changes to the remote repository.

To upload, complete the following steps:

1. Make sure you have saved all your changes.
2. Click the SCM button to open the SCM pane.

3. Click the Commit and Push button to upload your most recent changes to the remote repository.

   Note All changes will be committed and pushed to the remote repository.

4. In the Commit and Push Changes to the Remote Repository dialog box, enter a description for the changes that were made, and then click Commit & Push.

   The changes are saved to the remote repository.

Conflicts may arise if another author has made change to a file you are currently modifying. If the changes occur in different lines in the file, Git is able to automatically merge the two versions. If there are two sets of changes in the same line, they cannot be merged and you need to decide which of the 2 versions you want to keep.

When there is a conflict, you can solve it in the Resolve Conflicts dialog box, by choosing whether to keep your version of the file (Use mine) or the version that it is in conflict with (Use theirs).

1. When a conflict occurs (for example, when you try to pull a file from Git and another user has pushed a conflicting version of that file), the Resolve Conflicts dialog box appears.

   

2. Under Resolution Strategy, select one of the following:

   • Use mine - to use your version of the file to the repository
   • Use theirs - to keep the file that the other user created
3. Select the Keep Copy check box to save a local copy of the version that was not selected under Resolution Strategy.
4. Click Done.

You can revert changes that you made to an individual file or revert everything to a previous version. This action discards the changes that you have made.

• To revert changes for one file: Select the file in the SCM pane and click the Revert changes for the selected file button.
• To revert all changes, click the Revert all changes button.
  

  Note In case you Revert from a state of conflict (conflict dialog was closed without resolving), you will get the version of the file prior to triggering the conflict. You can then also Revert once again to discard your not pushed changes.

The Console tab is a console that displays a record of all the SCM actions that were taken in this session.

1. Click the SCM button to open the SCM pane.

2. Click the Console tab.

   

3. To clear the console, click Delete .