Resolve conflicts

  • Release version: Washingtondc
  • Updated February 1, 2024
  • 1 minute to read

    • App developers can select the app file version to use when applying remote or stashed changes in App Engine Studio (AES).

    Before you begin

    • Role required: admin
    • 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. App Engine Studio requires developers to resolve conflicts before applying remote or stashed changes.

    Procedure

    1. Navigate to All > App Engine > App Engine Studio.
    2. From the My Apps page, open your application.
    3. Pull from a repository or stash local changes.
      If the system identifies a conflict, it displays the Resolve Conflicts dialog.
    4. 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.
    5. 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.
    6. Select Apply Stashed Changes.
      The system applies the selected changes.
    7. Select Close Dialog.
    8. If you want to merge the conflicting changes, select Manually Apply.
      The system displays a list of version differences by field.
    9. Select the field values you want the merged application file to have.
    10. Select Save Merge.
      The system applies the selected changes.