Uploaded image for project: 'Qt Design Studio'
  1. Qt Design Studio
  2. QDS-12169

Allow users to do a 3 way merge when merging a component

    XMLWordPrintable

Details

    • AssetImporter 3 way merge

    Description

      Let the user configure a merge tool in QDS. QDS can provide the config for common tools and even auto-detect such tools. e.g.

      • Kaleidoscope
      • WinMerge
      • P4Merge
      • Beyond Compare

      Once QDS has a merge tool configured, the Asset importer plugin can launch the 3-way merge when a component is merged.

      Challenges/tasks:

      • Create a config JSON to have the configuration of known tools
      • Auto-detection of tools
      • When to launch/skip the 3-way merge.
      • Aux data manipulation.

      Attachments

        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

        Activity

          People

            vikas Vikas Pachdha
            vikas Vikas Pachdha
            Jarko Vihriälä Jarko Vihriälä
            Thomas Hartmann Thomas Hartmann
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:

              Gerrit Reviews

                There are no open Gerrit changes