Uploaded image for project: 'Confluence Data Center'
  1. Confluence Data Center
  2. CONFSERVER-11734

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

    XMLWordPrintable

Details

    • 0
    • 1
    • We collect Confluence 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

      NOTE: This suggestion is for Confluence Server. Using Confluence Cloud? 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

        Issue Links

          is related to

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

          • Closed

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

          • Gathering Interest
          relates to

          Suggestion - CONFSERVER-11635 CLONE -Page Lock While Editing

          • Closed

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

          • Closed

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

          • Gathering Interest

          Activity

            People

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

              Dates

                Created:
                Updated: