Resolve Conflicts¶

This page is used to resolve conflicts in branches.

Tabs

List of files/entities in which conflicts were found. You can switch tabs to go to other files/entities and resolve conflicts in them.

Left Preview Pane¶

Contains information on the child branch and preview of the file/entity with marked conflicts.

Note

Preview and marking of conflicts are available only for text files/entities. Also preview is available for image files. For other files that cannot be viewed in Flamingo IDE only ”Resource has been changed” message is shown.

Branch name

Name of the child branch.

Revision Info

Information on the current revision.

Author

Indicates who made the latest modification in the file/entity.

Changed

Shows the date and time of the latest revision.

Show History

Opens history of modifications made in this file/entity.

Right Preview Pane¶

Contains information on the Master branch and preview of the file/entity with marked conflicts.

Note

Preview and marking of conflicts are available only for text files/entities. Also preview is available for image files. For other files that cannot be viewed in Flamingo IDE only “Resource has been changed” message is shown.

Branch name

The name of the branch is always the same for the right pane - Master.

Revision Info

Information on the current Master branch revision.

Author

Indicates who made the latest modification in the file/entity.

Changed

Shows the date and time of the latest revision.

Show History

Opens history of modifications made in this file/entity.

Bottom Pane¶

Use this pane to view the resulting file/entity. Yellow warning triangles indicate location of conflicts and their index number. Click on the corresponding line to select the conflict you want to solve.

Note

This pane is available only for text files/entities.

Buttons¶

Use buttons at the bottom to choose the appropriate version of the file/entity and confirm your choice.

Use Left

Use variant of file/entity available in the child branch.

Use Right

Use variant of file/entity available in the Master branch.

Use Left for #

Use variant available in the child branch for resolving selected conflict.

Note

This button is available when resolving conflicts in text files/entities only.

Use Right for #

Use variant available in the Master branch for resolving selected conflict.

Note

This button is available when resolving conflicts in text files/entities only.

Number of conflicts

Indicates total number of conflicts in text file/entity.

Note

This information is available when resolving conflicts in text files/entities only.

Resolve

Use this button to confirm your choice for resolving conflict.