-
-
Notifications
You must be signed in to change notification settings - Fork 768
Open
@Rongronggg9
Description
A nice mix of two current mergeMethod: hardreset and merge. Effectively simulate the default git merge behavior and make the commit history clean.
A use case:
DIYgod/RSSHub has a pull.yml configuration file with mergeMethod: merge to prevent pull[bot] from overriding downstream manipulated forks (DIYgod/RSSHub#9710). In such a case, merge-ff is a better solution.