Closed Overseven closed 4 months ago
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?
thanks, one last nit: could you squash the two commits into a single one to keep git history clean?
thanks, one last nit: could you squash the two commits into a single one to keep git history clean?
How exactly should I do this? "Squash and merge" PR option is disabled for this repo. Should I create a new PR?
thanks, one last nit: could you squash the two commits into a single one to keep git history clean?
How exactly should I do this? "Squash and merge" PR option is disabled for this repo. Should I create a new PR?
No problem! In this case, what I would do (locally) is this:
move to your branch
git switch feature/ast-preprocess-unit-tests
rebase interactively to main
:
git rebase -i main
it will open a text editor with the following content:
pick 3d85ea3a fix(shield): add unit tests for ASP preprocess
pick 02f26da9 fix(shield): add NoopExpander
edit the second line like this:
pick 3d85ea3a fix(shield): add unit tests for ASP preprocess
f 02f26da9 fix(shield): add NoopExpander
(f
stands for fixup
= merge that commit into the commit above)
git log
if you want, you should see a single commit in your branch-f
but I usually do --force-with-lease
instead, which is a bit safer since it aborts if you're overriding someone else's commits!)
git push --force-with-lease
we have some more guides here https://docs.wardenprotocol.org/developers/contributing/#clean-up-mistakes-by-rewriting-history that explains possible alternatives on how to achieve this :)
hope it helps
@Pitasi Done!
closes #140
Summary by CodeRabbit