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

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

    XMLWordPrintable

Details

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

    Description

      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.

      Attachments

        1. p4merge - example.png
          47 kB
          Andreas van Rienen

        Issue Links

          is related to

          Suggestion - CONFCLOUD-8333 Real-time concurrent editing to allow multiple editors to collaboratively edit content

          • Closed

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

          • Gathering Interest
          relates to

          Suggestion - CONFCLOUD-21074 Make the warning message more instructive when two people are editing the same page

          • Closed

          Activity

            People

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

              Dates

                Created:
                Updated: