Menu
I'd like to preserve merge commits even if there was no change in the originating branch since than.
Is there such an option in Atlassian SourceTree? I just can't find it at the first sight.
547
During situations when you require a merge commit during a fast forward merge for record-keeping purposes, you will execute git merge with the --no-ff parameter. This command merges the specified branch int the command into the current branch, but always performs a merge commit (even if it was a fast-forward merge).
Note that fast-forward updates do not create a merge commit and therefore there is no way to stop those merges with --no-commit. Thus, if you want to ensure your branch is not changed or updated by the merge command, use --no-ff with --no-commit.
Ahh, got that. There is a "Do not fast-forward when merging, always create commit" option in preferences.
142
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
