Pull preview

Rows of highlighted conflicts or changes.

Select

Take all local

to accept all of the local changes. Select

Take all remote

to accept all of the changes in the remote repository.

Filter the changes in the preview by displaying

All

project content, only

Updates

to the project, or only

Conflicts

in the project.

Select

to navigate to and expand the next conflict, or select

navigate to the previous conflict.

Select a conflict to the left in a row to accept the local change.

Local history

indicates local content. Changes in values are indicated and removed objects are crossed out.

Select a conflict to the right in a row to accept the remote change.

Remote history

. indicates remote content. Changes in values are indicated and removed objects are crossed out.

An icon in a row indicates:

A conflict exists between the local and remote repository.

A conflict was resolved by selecting either the local or remote change in the row.

A change exists in the local or remote repository.

An object was added.

An object was removed.