Uploaded image for project: 'Qt Quality Assurance Infrastructure'
  1. Qt Quality Assurance Infrastructure
  2. QTQAINFRA-4984

Enable inexact rename detection for cherry-pick bot

XMLWordPrintable

    • Icon: Suggestion Suggestion
    • Resolution: Unresolved
    • Icon: P2: Important P2: Important
    • None
    • None
    • Cherry-pick bot
    • None

      It leads to fewer conflicts. This cherry-pick, e.g..:

      https://codereview.qt-project.org/c/qt/tqtc-qtdeclarative/+/408261

      Does not fail locally when inexact rename detection is enabled (merge.renamelimit=20000).

      And this:

      https://codereview.qt-project.org/c/qt/tqtc-qtdeclarative/+/408551

      at least finds the correct file and fails only the actually-conflicting stuff (m_mgr), putting proper conflict markers in the correct files.

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

            jujokini Jukka Jokiniva
            mmutz Marc Mutz
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Created:
              Updated:

                There are no open Gerrit changes