Uploaded image for project: 'Bitbucket Cloud'
  1. Bitbucket Cloud
  2. BCLOUD-19568

Ability to resolve simple merge conflicts in UI without manually pulling

XMLWordPrintable

    • 10

    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

      In Github they make it easy for users to edit and resolve merge conflicts in a file just by editing inline in the

      Bitbucket seems to require manually pulling through repo and going through merge resolution steps even for simple merges like just extra sections of code being added from a previously merged pull request .

            [BCLOUD-19568] Ability to resolve simple merge conflicts in UI without manually pulling

            Josh Nederveld added a comment -

            Resolving simple merge conflicts in the browser would save us a ton of time. Bitbucket needs this feature to keep up with other git cloud solutions.

            Josh Nederveld added a comment - Resolving simple merge conflicts in the browser would save us a ton of time. Bitbucket needs this feature to keep up with other git cloud solutions.

            marinus_payat added a comment -

            please!!!

            marinus_payat added a comment - please!!!

            Jordan Milton added a comment -

            Alternatively (or as well as) would be good to have some automatic resolution options per conflict (e.g. Resolve as ours/theirs, ours then theirs, theirs than ours).

            Both atom and visual studio code have these options at an IDE level but being able to do it on Bitbucket would be a huge quality of life improvement.

            Jordan Milton added a comment - Alternatively (or as well as) would be good to have some automatic resolution options per conflict (e.g. Resolve as ours/theirs, ours then theirs, theirs than ours). Both atom and visual studio code have these options at an IDE level but being able to do it on Bitbucket would be a huge quality of life improvement.

            Wes H added a comment - - edited

            * inline in the browser

            (can't edit issue Description)

            Wes H added a comment - - edited * inline in the browser (can't edit issue Description)

              Unassigned Unassigned
              2702a286f8f5 Wes H
              Votes:
              28 Vote for this issue
              Watchers:
              14 Start watching this issue

                Created:
                Updated: