Skip to content

Option to create a merge commit instead of rebase #77

@TSMMark

Description

@TSMMark

Thanks for this, it looks neat.

Personally for my team, I see the git push --force-with-lease requirement as potentially disastrous if people are not paying close attention.

IMO the main value of this AutoRebase GH action is to save time and mental overhead of keeping branches up to date. However, if we are simply replacing that overhead with a different & more dangerous overhead: requiring force push, and paying close attention to not do this destructively — to me, that entirely eliminates the value of this GH action.


Merge commits may be annoying to deal with but at least they are not modifying git history, requiring dangerous force pushes, etc. It seems like an easy compromise to make.

Would you accept a PR that adds the option to create a merge commit rather than rebase?

Thanks

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions