You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This has just started happening 2-3 days ago and I'm not sure why. Is it possible it has to do with the recent commits that happened since 3 days ago? Pinging the authors too in case it might be related (#159 cc @andrewhamon, #153 cc @cadolphs, #162 cc @spacedentist)
Repro:
git checkout -b branch
make change, git commit (hash: 123)
spr diff, PR is created
have someone stamp it
go to main and get latest changes to prepare for rebase: git checkout origin/main; git pull origin main --rebase
cherry-pick the commit to land git cherry-pick 123
spr diff -m "rebase"
spr land, get below error
> spr land
847b2ea [drac] fix up add wallet (1/n)
#️⃣ Pull Request #1789
🛫 Getting started...
❌ GitHub Pull Request merge failed
🛑 GitHub: At least 1 approving review is required by reviewers with write access.
Documentation URL: https://docs.github.com/articles/about-protected-branches
Let me know if there's anything else I can help with
The text was updated successfully, but these errors were encountered:
Hmm it might be because we've recently added pre-commit hooks that require an approval before it can be merged, as well as passing a build check
but my approval + build check is all against the parent diff instead of the main branch, so when spr land swaps it to be against the main branch, it fails the pre-commit hook until the newly build check that got kicked off finishes.
Any suggestions for how to best get around this? Is there a way for spr to bypass pre-commit hooks vs main, as long as they passed when it was against the parent diff?
This has just started happening 2-3 days ago and I'm not sure why. Is it possible it has to do with the recent commits that happened since 3 days ago? Pinging the authors too in case it might be related (#159 cc @andrewhamon, #153 cc @cadolphs, #162 cc @spacedentist)
Repro:
git checkout origin/main; git pull origin main --rebase
git cherry-pick 123
spr diff -m "rebase"
spr land
, get below errorLet me know if there's anything else I can help with
The text was updated successfully, but these errors were encountered: