Ability to define Auto merge command in stash-config.properties

XMLWordPrintable

    • Type: Suggestion
    • Resolution: Won't Fix
    • None
    • Component/s: None
    • None

      We need to perform merges with:

      git -c merge.renameLimit=32765 merge -s recursive -X patience --no-ff --log

      If Stash will allo to specify merge command within Pull Request settings it will be amazing. If only in stash-config.properties it will be also great.

      We need this for large repository (many-many files, over 2GB). Git stop rename analyses if you run git merge without any settings from above.

      The main reason why we need this. We get dozen conflicts in moved files. But Stash make automerge with DELETED conflict only, it did not understand renames correctly.

            Assignee:
            Unassigned
            Reporter:
            Alexey Efimov
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: