Comments (4)
nix1016
commented on June 9, 2024
1
409 - Merge conflict
from merge-branch.
EpsilonAlpha
commented on June 9, 2024
1
Okay i found the solution @esg-odeoliveira and i'm sure this will work better than people just requoting the error message without giving any hint.
You create a new pull request on GitHub and like that "imiating" what the github action should do, merging the exact same branches. In my case that gave me 2 files which are missmatching.
from merge-branch.
rsodre
commented on June 9, 2024
I'm having this error after a force push.
Isn't it the case to add a force option to ignore conflicts and always use from_branch versions?
from merge-branch.
EpsilonAlpha
commented on June 9, 2024
I have the exact same error. Sidenote on mine is:
That 6 other merges running fine, but numbero 7 doesn't. The Push before worked fine:
Have the Problem since 27 days on my end without changing the workflow file in the meantime.
My error is:
/usr/local/bundle/gems/octokit-4.14.0/lib/octokit/response/raise_error.rb:16:in `on_complete': POST https://api.github.com/repos/EpsilonAlpha/saltmaster/merges: 409 - Merge conflict // See: https://docs.github.com/rest/reference/repos#merge-a-branch (Octokit::Conflict)
from /usr/local/bundle/gems/faraday-0.17.0/lib/faraday/response.rb:[9](https://github.com/EpsilonAlpha/saltmaster/actions/runs/3138600033/jobs/5098110177#step:4:10):in `block in call'
from /usr/local/bundle/gems/faraday-0.17.0/lib/faraday/response.rb:61:in `on_complete'
from /usr/local/bundle/gems/faraday-0.17.0/lib/faraday/response.rb:8:in `call'
from /usr/local/bundle/gems/octokit-4.14.0/lib/octokit/middleware/follow_redirects.rb:73:in `perform_with_redirection'
from /usr/local/bundle/gems/octokit-4.14.0/lib/octokit/middleware/follow_redirects.rb:61:in `call'
from /usr/local/bundle/gems/faraday-0.17.0/lib/faraday/request/retry.rb:[13](https://github.com/EpsilonAlpha/saltmaster/actions/runs/3138600033/jobs/5098110177#step:4:14)0:in `call'
from /usr/local/bundle/gems/faraday-0.17.0/lib/faraday/rack_builder.rb:[14](https://github.com/EpsilonAlpha/saltmaster/actions/runs/3138600033/jobs/5098110177#step:4:15)3:in `build_response'
from /usr/local/bundle/gems/faraday-0.17.0/lib/faraday/connection.rb:387:in `run_request'
from /usr/local/bundle/gems/faraday-0.17.0/lib/faraday/connection.rb:175:in `post'
from /usr/local/bundle/gems/sawyer-0.8.2/lib/sawyer/agent.rb:94:in `call'
from /usr/local/bundle/gems/octokit-4.14.0/lib/octokit/connection.rb:[15](https://github.com/EpsilonAlpha/saltmaster/actions/runs/3138600033/jobs/5098110177#step:4:16)6:in `request'
from /usr/local/bundle/gems/octokit-4.14.0/lib/octokit/connection.rb:28:in `post'
from /usr/local/bundle/gems/octokit-4.14.0/lib/octokit/client/commits.rb:[21](https://github.com/EpsilonAlpha/saltmaster/actions/runs/3138600033/jobs/5098110177#step:4:22)4:in `merge'
from /action/lib/index.rb:26:in `<main>'
Yeah yeah, "Merge conflict" but what does it mean exactly? Is there a verbose option which gives me A LITTLE more information?
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
- Auto resolve conflicts HOT 2
- Bypass branch protection rule HOT 3
- delete merged branch? HOT 1
- [Question] How do it works the env variable GITHUB_SHA? HOT 2
- 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.