Comments (2)
alexcroox
commented on June 9, 2024
1
It would be useful if the step could set a flag if there was a conflict so we can take post actions such as commenting on the PR a manual resolution needs to happen
from merge-branch.
andrewfenn
commented on June 9, 2024
After looking into this it doesn't seem possible to do this because the github API doesn't support merging of branches with conflicts.
https://docs.github.com/en/rest/reference/branches#merge-a-branch
It might be possible to check out the code and do something outside of the API but I do not think the author of this project would want to do that given they're explicitly using the github API.
My recommendation would be to first bug Github to add it as a feature to their rest API.
from merge-branch.
Related Issues (20)
- Workflow doesn't trigger on labeled pull request HOT 4
- Can a Personal Access Token be used in place of github.token? HOT 2
- Frequent false positive merge conflicts
- 1.4.0 not found HOT 4
- Add an input to customize the merge message HOT 4
- Does this work with PRs from forks? HOT 3
- Merge commit no longer has a message HOT 2
- Avoid creating merge commit HOT 7
- Bypass branch protection rule HOT 3
- delete merged branch? HOT 1
- [Question] How do it works the env variable GITHUB_SHA? HOT 2
- Error while merging HOT 4
- Author other than bot
- merge silently skiped
- Resource not accessible by integration HOT 2
- Adding outputs to this action
- Feature: Ability to replace a branch instead of merge HOT 1
- 500 error HOT 9
- Getting 404 HOT 6
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 merge-branch.