conflict when cherry-picking multiple commits

XMLWordPrintable

    • Type: Bug
    • Resolution: Unresolved
    • Priority: Low
    • None
    • Affects Version/s: 1.7.4.1
    • Component/s: Git
    • None
    • Environment:

      Mac OSX 10.7.5

    • Severity 3 - Minor

      There is a problem with cherry-pick. If you select multiple commits and select cherry-pick sometimes there is an error.

      The explanation:

      If you select multiple commits and click in cherry-pick the sourcetree does not apply the selected commits in the correct order.

      So, if a commit is dependent of another (such a bugfix of a bugfix) may occur a problem that the second be apply before the first, causing conflict error.

      The above behavior explains why it works when cherry-picking individual commits. In this case, the user will apply the commits manually, one by one, in the right order and will not get conflict errors.

      So the bug is that sourcetree not apply the selected commits in the right order.

      This problem may be related to other threads that do not explain the cause of the problem.

              Assignee:
              Unassigned
              Reporter:
              Rodrigo Peruch
              Votes:
              2 Vote for this issue
              Watchers:
              3 Start watching this issue

                Created:
                Updated: