Resolve conflicts

Application developers can choose which application file version to use when applying remote or stashed changes.

Before you begin

  • Role required: admin or source_control
  • Link an application to source control
  • Apply a stashed change

About this task

Conflicts occur when there are multiple change versions of the same application file: one set of changes in the remote or stashed version and another set of changes in the local version. Studio requires developers resolve conflicts before applying remote or stashed changes.

Procedure

  1. From Studio, apply remote or stash changes.
    If the system identifies a conflict, it displays the Resolve Conflicts dialog.
  2. Select how to resolve the conflict.
    OptionDescription
    Select an action Apply or discard all stashed changes. Go to Step 3.
    Manually merge changes Individually select which changes to apply. Go to Step 6.
  3. If you want to apply or discard all stashed changes, select an Action.
    OptionDescription
    Take Stashed Changes Applies the application file version from the stashed changes.
    Discard Stashed Changes Applies the application file version from the most recent pull from the repository.
  4. Click Apply Stashed Changes.
    The system applies the selected changes.
  5. Click Close Dialog.
  6. If you want to merge the conflicting changes, click Manually Apply.
    The system displays a list of version differences by field.
  7. Select the field values you want the merged application file to have.
  8. Click Save Merge.
    The system applies the selected changes.