Lack of "merge commit event if can fast-forward" option

XMLWordPrintable

    • Type: Bug
    • Resolution: Fixed
    • Priority: Low
    • None
    • Affects Version/s: 2.5.1, 2.5.2
    • Component/s: None
    • Severity 3 - Minor

      On SourceTree for macOS, newest version (2.5.1), when trying to merge with right click-> "merge X into Y" -> after the confirmation pop-up shows, there is no option to force a merge commit. On SourceTree for Windows (v 2.x) there pop-up is the same, except for the 'force merge-commit' checkbox.

      Therefore, a fast-forward is done always when possible. This is incorrect behavior if, for example, we are following the git-flow rules.

      If I merge a branch through the "merge" button on top of view, I can force a merge commit, so that's a temporal workaround, however not really comfortable.

        1. ScreenShot.png
          ScreenShot.png
          603 kB
        2. st_mac_bug.png
          st_mac_bug.png
          65 kB
        3. st_win.png
          st_win.png
          5 kB

            Assignee:
            Unassigned
            Reporter:
            Jesse Yowell (Inactive)
            Votes:
            2 Vote for this issue
            Watchers:
            4 Start watching this issue

              Created:
              Updated:
              Resolved: