Uploaded image for project: 'Confluence Cloud'
  1. Confluence Cloud
  2. CONFCLOUD-11734

Provide a proper 3-way merge tool for edit conflicts.

XMLWordPrintable

    • 0

    • 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.

      NOTE: This suggestion is for Confluence Cloud. Using Confluence Server? See the corresponding suggestion.

      When an edit conflict occurs, we should provide a proper, interactive merge resolution tool instead of the current confusing "do it yourself in this big edit window" approach.

      Tricky? Yes. Impressive if we got it working? Absolutely.

        1. p4merge - example.png
          p4merge - example.png
          47 kB

              Unassigned Unassigned
              cmiller@atlassian.com Charles Miller (Inactive)
              Votes:
              48 Vote for this issue
              Watchers:
              28 Start watching this issue

                Created:
                Updated: