search

saitho / semantic-release-backmerge

:twisted_rightwards_arrows: semantic-release plugin to back-merge a release into a develop branch
https://saitho.github.io/semantic-release-backmerge/
56 stars 11 forks source link

feat(*): add option for fast forwarding during commit #50

Closed fruit-ninja closed 1 year ago

fruit-ninja commented 1 year ago

Add new setting "fastForwardMode" to determine if the backmerge commit should be fast forwarded.

none: default setting which is the same as ff. ff: when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit. no-ff: create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward. ff-only: resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status.

fix #49

fruit-ninja commented 1 year ago

@saitho I hope you are doing well 😄 Whenever you get an opportunity, would you please review this PR? Thanks so much!

saitho commented 1 year ago

Hi @fruit-ninja

thanks for your PR! :) Looks good, but I'd like to have one more test for the Git command.

saitho commented 1 year ago

:tada: This PR is included in version 3.2.0 :tada:

The release is available on:

Your semantic-release bot :package::rocket: