Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-13094

Provide an option to force a "fast-forward" merge from within Sourcetree

    XMLWordPrintable

    Details

    • Type: Suggestion
    • Status: Gathering Interest (View Workflow)
    • Resolution: Unresolved
    • Fix Version/s: None
    • Component/s: Git
    • Labels:
      None
    • Feedback Policy:

      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

      Use Case

      In our project, due to the branching model, most of the merges are none `fast-forward` merges. Therefore, I have set `git config merge.ff false` in my config in case I am merging from the terminal. However, with this setting I am not capable any longer to "force" a `fast-forward` merge from Sourcetree! Even if I uncheck Create a new commit even if fast-forward is possible, Sourcetree triggers a "normal" merge thus falling back onto the settings from the git config.

      Cause of the issue

      Sourcetree calls git merge branch-name when Create a new commit even if fast-forward is possible is not checked:

      ```
      git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks merge branch-name
      ```

      Suggestion

      Be explicit with the command that is triggered by Sourcetree when unchecking. That is, ...

      ... either make `git merge --ff branch-name` the command which is triggered (instead of `git merge branch-name`),

      ... or even provide a option like Require fast-forward merge triggering `git merge --ff-only branch-name`.

        Attachments

          Activity

            People

            Assignee:
            Unassigned
            Reporter:
            65059683269f mingud
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

              Dates

              Created:
              Updated: