In git merge there are several ways to merge branches however, the most commonly used options are --ff-only and --no-ff. The --ff-only option will resolve the merge as a fast-forward when possible. When not possible, it refuses to merge and will exit with a non-zero status. Best examples used by this options are branches from features and hotfixes.
pifabs
/ git-merge-to-ff-or-not-to-ff.md
Created
August 5, 2022 04:35
— forked from albertpark/git-merge-to-ff-or-not-to-ff.md