Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-2612

Git-flow finish feature merge does not obey fast-forward merge preference

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Unresolved
    • None
    • GitFlow
    • None
    • Using Embedded git-flow
    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

    Description

      I have the "Do not fast-forward when merging, always create commit" option in the git preferences turned on. I was surprised today when finishing a feature, which had only one commit and no other activity on the develop branch since the feature branch was created, that the merge was fast-forwarded on top of the develop branch instead of creating a merge commit as set by my preference.

      Git-flow should obey this preference.

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              2216c6bf7d41 Michael Ledford
              Votes:
              4 Vote for this issue
              Watchers:
              7 Start watching this issue

              Dates

                Created:
                Updated: