Uploaded image for project: 'Bitbucket Server'
  1. Bitbucket Server
  2. BSERV-4617

Resolve Merge Conflicts from Stash

    XMLWordPrintable

    Details

    • Feedback Policy:
      We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.

      Description

      When moving through pull requests and a merge conflict comes up sometimes it is just a matter of resolving everything to the newer version. i would be nice to have this option from the GUI, or to be able to edit simple conflicts.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              Unassigned
              Reporter:
              andrew.danelz AJ DaNelz
              Votes:
              35 Vote for this issue
              Watchers:
              12 Start watching this issue

                Dates

                Created:
                Updated: