IMPORTANT: JAC is a Public system and anyone on the internet will be able to view the data in the created JAC tickets. Please don’t include Customer or Sensitive data in the JAC ticket.

    • 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
          47 kB
          Andreas van Rienen

            Loading...
            IMPORTANT: JAC is a Public system and anyone on the internet will be able to view the data in the created JAC tickets. Please don’t include Customer or Sensitive data in the JAC ticket.

              • 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
                    47 kB
                    Andreas van Rienen

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

                          Created:
                          Updated:

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

                              Created:
                              Updated: