chore: fix git history by unsquashing previous merge commit #13742
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
|
|
Contributor
Author
|
Worth noting the diff here is useless, so this PR is more or less just a review of the idea and approach. You can run |
Collaborator
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
njlynch
added a commit
that referenced
this pull request
Mar 23, 2021
The forward merge #13414 was erroneously squash-merged, resulting in some defects in the future forward merges. In particular, #13426 was dropped, un-reverting the commit and causing issues. There were also some test changes from #13462 that appeared to be dropped. This PR fixes the issue by just directly applying a patch to v2-main that solves the difference between the current v2-main and what we'd have if we un-squashed the squashed merge-commit and replayed all commits after that. This is an effective duplicate of #13742, except that this is a clean patch that can be applied, whereas the other is a rebased branch that will need to be force-pushed to be applied.
Contributor
Author
|
Current |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 forward merge #13414 was erroneously squash-merged, resulting in some defects in the future forward merges. In particular, #13426 was dropped, un-reverting the commit and causing issues. There were also some test changes from #13462 that appeared to be dropped.
This change will need to be force-pushed to be applied. Open to folks telling me this is a Bad Idea and shouldn't be done.
Approach taken:
At the end, running
git diff origin/v2-mainshows that #13426 has been re-picked up and applied correctly, and a few other minor merge conflict changes have been made.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license