-
Notifications
You must be signed in to change notification settings - Fork 0
Description
Context
In many Git workflows rebase of an ephemeral branch is preferred over merging long-living branches into ephemeral branches. I.e., these projects have the stance that there should be no Merge branch 'develop' into 'feature/X'
commits. This is mostly backup up by graph theory, "nicer history", and that it minimizes the probability of foxtrot merges.
All this presumes that you are working with no fast-forward merges, no rebase merges; i.e., you are using GitFlow (https://nvie.com/posts/a-successful-git-branching-model/) or a similar history management strategy.
Idea
Create a hook, which prevents merge commits on configured branches. For consistency with already existing hook by default feature
, bugfix
, and hotfix
should be considered by the hook and this list could be overriden by arguments.
Metadata
Metadata
Assignees
Labels
Type
Projects
Status