Comments (2)
I think Xtheirs
is correct, but I'm not sure why the commits are reordered.
https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---merge
when a merge conflict happens, the side reported as ours is the so-far rebased series, starting with <upstream>, and theirs is the working branch. In other words, the sides are swapped.
I'll investigate this and maybe consider not rebasing, as I mentioned here: #50 (comment)
from create-pull-request.
I refactored to not use rebase. Please see this comment: #50 (comment)
I will close this issue and keep the other issue open if there is any further discussion regarding the new approach.
from create-pull-request.
Related Issues (20)
- Unable to create new PR from old branch HOT 1
- unable to create pull request due to cherry-picker error HOT 1
- Pass parameters to commit
- Request: Document PAT permissions requirements for machine accounts HOT 2
- `push-to-fork` won't push to sibling repos in the same network HOT 3
- add a no-verify option HOT 1
- Support commenting on a PR when closing it HOT 4
- PR is geeting auto merge HOT 1
- Commit author is `web-flow`? HOT 3
- Fine-grained PATs will also work HOT 2
- Upgrade action to use node20 HOT 4
- Commit message not updated when PR is updated HOT 1
- Actions not triggering even with Custom App HOT 6
- Photo from Tajdoost
- stale info error when specified branch doesn't exist but a tag with the same name exists HOT 2
- Add no-verify option because rm -rf .git/hooks doesn't work HOT 2
- Github Action is not working HOT 1
- This isn't recognizing changes between two branches of two repos HOT 2
- using with git-crypt HOT 4
- Is it possible to fully restore all git state after the action? HOT 5
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 create-pull-request.