-
Notifications
You must be signed in to change notification settings - Fork 48
Automate subtree update #248
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Automate subtree update #248
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you! I'd recommend running this on your fork to check if it works if you haven't already.
1a916ca
to
a895b16
Compare
I have now done so, leading to the observation that |
There should not be a need for manual processes for the first stage of the subtree update, i.e., updating our subtree/library branch. Merge conflicts (which might require a human to intervene) will only happen once attempting to merge from subtree/library back into main. Automation for this stage has been added, will create a PR separate from the above one, and will likely require manual intervention.
a895b16
to
00ca764
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made some small changes in my fork: carolynzech@8615a31
to modify the PR bodies to refer to the the first range in the commit as well as the last one (see carolynzech#8 for an example). The idea is that this way we can run git log --oneline
between the two hashes to get a snapshot of the original history we're introducing, since the commit hashes in the PR will no longer match. Other than that, this looks good to go.
Thanks for all the work on this, @tautschnig! 🚀
Thank you, cherry-picked into my branch. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be ready to be merged.
There should not be a need for manual processes for the first stage of the subtree update, i.e., updating our subtree/library branch.
Merge conflicts (which might require a human to intervene) will only happen once attempting to merge from subtree/library back into main. Automation for this stage has been added, will create a PR separate from the above one, and will likely require manual intervention.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.