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

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

      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.

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

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

                Created:
                Updated: