Allow merge commits #17
Open
Conversation
This file contains 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
Previously merge commits were disallowed. When using stacked PRs, if the initial PR uses a squash merge, git and github loose the information to associate the initial commits in subsequent PRs as belonging to the initial PR. This results in github saying there are merge conflicts. Using merge commits allows github to better keep track of which commits are unique to each PR.
|
Current dependencies on/for this PR:
This stack of pull requests is managed by Graphite. |
❌ Unreviewed dependencies found
|
Codecov Report
@@ Coverage Diff @@
## main #17 +/- ##
=======================================
Coverage 79.42% 79.42%
=======================================
Files 2 2
Lines 243 243
=======================================
Hits 193 193
Misses 50 50 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
jcape
approved these changes
May 5, 2023
jcape
approved these changes
May 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously merge commits were disallowed. When using stacked PRs, if the
initial PR uses a squash merge, git and github loose the information to
associate the initial commits in subsequent PRs as belonging to the
initial PR. This results in github saying there are merge conflicts.
Using merge commits allows github to better keep track of which commits
are unique to each PR.
Motivation