Repository navigation
chore: allow rebase merges of coherent commit series - #119
Merged
Merged
Conversation
The rule "one PR is one changelog entry" forced a branch of coherent commits, such as a fix, a framework feature and a stacklet that uses it, into separate stacked PRs. A rebase merge keeps those commits as they are, and each subject becomes its own changelog line. dev.md and the pr skill now allow either mode per PR: squash for a single change or work-in-progress commits, rebase for a series whose commits each stand alone and pass commit-lint. Merge commits stay out.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The rule "one PR is one changelog entry" forced a branch of coherent commits, such as a fix, a framework feature and a stacklet that uses it, into separate stacked PRs. A rebase merge keeps those commits as they are, and each subject becomes its own changelog line.
dev.md and the pr skill now allow either mode per PR: squash for a single change or work-in-progress commits, rebase for a series whose commits each stand alone and pass commit-lint. Merge commits stay out.