Uploaded image for project: 'Change Request Application'
  1. Change Request Application
  2. CRAPP-15

Handle conflicts before merging change request

    XMLWordPrintable

Details

    • Improvement
    • Resolution: Fixed
    • Major
    • 0.4
    • 0.1
    • None
    • None
    • Unit
    • Unknown
    • N/A

    Description

      We should be able to fix conflicts in change requests before merging it.

      Attachments

        Issue Links

          is related to

          Bug - A problem which impairs or prevents the functions of the product. XWIKI-18909 DIsplaying diff with conflicts should not display a custom choice selection

          • Major - Major loss of function.
          • Open
          relates to

          Improvement - An improvement or enhancement to an existing feature or task. XWIKI-18908 Handle properly xobjects conflicts when merging documents

          • Major - Major loss of function.
          • Open

          Activity

            People

              surli Simon Urli
              surli Simon Urli
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: