Comments (6)
I'm not sure I understand. Can you provide more details and/or copy-paste the error message? We have branch protection on as well and require PRs, and have no problems landing with spr.
from spr.
This could be some other esoteric issue with Github.
When attempting to spr land
, it fails printing "Merge attempt failed. Changes must be made through a pull request".
Of course, the branch up on Github is frontend by a pull request. Once spr failed to merge this from the command line I tried merging from Github's web UI by pressing the "Merge" button, I got the same exact error within the UI:
I ended up having to temporarily disable branch protection to land this.
Since this is happening also on Github, it may be a Github specific issue. However, is there anything about how spr does the branch set up or pull requests creation that might be non-traditional to cause Github to be confused about it's state as a valid PR?
from spr.
I am puzzled and intrigued.
This is the branch protection rule for the master branch in this repository:
There are no branch protection rules for any other branches in this repository. With this configuration, I have no problems using spr land
for merging.
I'm wondering if your configuration is stricter in some way.
Does this problem occur with single PRs (those that are created targeting your main branch), or PRs that are based on other unlanded changes (those for which spr creates a synthetic base branch). Or both?
from spr.
My branch protection is actually less strict (for now). Our primary branch is main
rather than master
but otherwise I see no significant differences here.
Does this problem occur with single PRs (those that are created targeting your main branch), or PRs that are based on other unlanded changes (those for which spr creates a synthetic base branch). Or both?
This particular case was the first in a stack, so was not based on unlanded changes. I have not yet tested other scenarios in this particular repo yet
from spr.
Seeing the same issue here with branch protection:
It is the first of two stacked PRs, we have branch protection on master
from spr.
This is certainly a github bug but if I update the base branch in their UI to be master (even for the first PR in a stack that should already be master) spr land
then works.
from spr.
Related Issues (20)
- Multiple stacks of work? HOT 1
- [question] Any way to support squash merging PR in GitHub UI and then update locally?
- [feature request] Show stack in PR
- [Critical Bug] Error when updating an existing PR HOT 4
- spr list (and land) PR statuses are always PENDING HOT 1
- Formula Name Conflict Between Two Projects
- Maintenance status HOT 1
- spr diff uses jujutsu to amend? HOT 4
- Changing Base Branche Dismisses the Reviewers' Approval
- `an unknown git error occurred; code=NotFound (-3)` HOT 1
- Please update the ring crate to 17.x
- Support specification of branch name in `spr diff` HOT 1
- Remove "Reviewers:" for `spr land` HOT 2
- Support for Bitbucket and others?
- invalid data in index - calculated checksum does not match expected; class=Index (10) HOT 1
- Use spr and bors together
- Spr doesn't recognize existing commits/PRs
- feat(cli): support `githubMasterBranch` from CLI
- [docs] Need clarification on how to insert a commit into the middle of an ongoing stacked PR review
- Documentation Webpage returning 404 from Github Pages HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from spr.