Change the UI pop-up for Pull Request Conflicts

XMLWordPrintable

    • 1

      Summary:
      Update the suggested local commands in the Bitbucket Cloud Pull Request conflict dialog to use a branch-based workflow (e.g., git switch) instead of commands that result in a detached HEAD state.

      Current Behavior:
      When a pull request has merge conflicts, the Bitbucket Cloud UI provides a "how to fix" dialog with suggested code snippets. Currently, these snippets often recommend a workflow that uses git checkout <commit_hash>, which puts the user into a detached HEAD state.

      Suggestion:
      Modify the suggested command sequence to keep the user on their branch. For example, instead of the current suggestion, provide a flow similar to:

      git switch <your_branch_name>
      git merge remotes/origin/<destination_branch>
      

              Assignee:
              Unassigned
              Reporter:
              Alan R
              Votes:
              1 Vote for this issue
              Watchers:
              1 Start watching this issue

                Created:
                Updated: