chore(porch): bugfix-298 state commits stranded after #300 merged - #303
Merged
Conversation
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
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.
Summary
porch done bugfix-298 --merged 300writes its state commit after the PR merges, so thecommit lands on a branch nothing will pull. #300 is merged and this one entry never reached
main.Refs #233
What is in it
One commit, one file, three lines:
origin/mainis merged into the branch first, so the diff againstmainis exactly that fileand nothing else.
Test Plan
git diff origin/main..HEAD --statshows one file, 3 insertions, 1 deletion