Edit online

Incoming Commits

You can click the Incoming commits drop-down on the right side of the second top stripe to display more information regarding the status of incoming commits and gain access to additional actions.

Figure 1. Incoming Commits Drop-down

Incoming commits are automatically refreshed periodically, but you can click the Refresh button to refresh manually.

When there are no conflicts, you can click the Pull button to pull the incoming changes. This can also be done from the Changes view.

When there are no conflicts, you can also click the View changed files button to see a comparison of the incoming changes versus the current workspace version and a Pull action is available in that comparison dialog box.

If there are conflicts, the badge with the number of incoming commits is highlighted in red. You can click the Resolve conflicts button to open a dialog box where you can choose actions for resolving the conflicts.

Figure 2. Incoming Commits with Conflicts

Resolving and Merging Conflicts

When conflicts are detected between changes in your workspace and incoming changes from the project, click the Resolve conflicts button either from the Changes view or the Incoming commits drop-down. This opens a conflict resolution dialog box.

Figure 3. Conflict Resolution Dialog Box
The left pane shows the incoming changes. You can toggle the Show only conflicts button to filter the list to focus on the conflicts. There are three types of incoming changes and each have a dedicated icon:
  • - Conflicting changes that cannot be automatically merged and require manual intervention.
  • - Incoming changes can be automatically merged.
  • - Incoming files from the project that are not present in your workspace.
The incoming changes that can be automatically merged () and new files coming from the project () do not require any manual action and will be merged when you click the Pull button. Conflicting files () require that you choose an action from the drop-down to the right of the file entry. The possible actions are:
  • Manual merge - The user must edit the file and merge the changes manually.
  • Keep workspace changes - Overrides the changes coming from the project with your workspace changes.
  • Keep project changes - Keeps the changes coming from the project and discards your workspace changes.

Click the file entry to display a comparison of the two versions of the document. The current workspace version of the document is displayed on the left while the version from the project is displayed on the right. You can use the toolbar buttons to navigate through the changes or copy changes from the right to left (from the project to the workspace).

You can also edit your current workspace version in the left side and it includes content completion and contextual menu actions. Note that if you change the Manual merge option to another type of resolution, your changes are discarded.

Once you are finished, click the Pull button in the bottom-right corner to finish the conflict resolution and merge the changes. If you close the dialog box without using the Pull button, your changes are discarded.