Comments (6)
The rebase is not automatic, it should be done manual because in doing it there could be many conflicts.
from gush.
In my experience, it must be automatic, otherwise the squashed commits sometimes reverts "silently" changes done at base branch after the PR creation but before its merge, since GH diff isn't showing that situation. So, in short words, a conflicted rebase could warn about issues between the histories that the command is trying to merge, and if it happens, the PR can be marked as not ready to be merged.
from gush.
what happens if it fails the rebase? or requires intervention? as often they do. It should just give a warning about, please make sure it is rebased, or the command only should work when it ensures the PR is rebased. Otherwise gives a note, i think git has a way to find out quickly.
from gush.
Sure, that's the main idea, try to rebase automatically, abort the rebase if it has failed, warn the user about the situation and aborting the PR merge operation. But IMO it is much more painless than let merge PRs that reverts previous changes without any notice of that situation. Last week I found myself reverting PRs for this reason, that only happen with the use of --squash
option in PRs with more than one commit as I mentioned before.
from gush.
what i mean is there is a way to check already if it is rebased or not via git. That is all, so we can just do an early check for that and abort or even prevent from running the command very early. I personally prefer to do things observing, so i don't often let gush do my rebases, this is in my experience, because i know there are always things
I want to do besides skipping any errors. I honestly think the squash thing is only useful in FOSS context, but i do not use squash at work.
from gush.
I tend to work the same way at proprietary / FOSS environments, but I've updated the PR taking into account your concerns.
from gush.
Related Issues (20)
- Show which base-branch the pull-request will be opend against HOT 1
- New approach for pull-request:create template HOT 1
- [Gush org] Remove priority labels for issues and pull-requests HOT 3
- dockerize HOT 2
- // FIXME or // todo or @todos on code HOT 1
- [Bitbucket] Disallow forking repo to same org HOT 6
- [GitLab] getPullRequestCommits has a noop implementation HOT 4
- [Adapter] Allow to configure forks organization HOT 2
- recover quicker and simpler way to merge a PR
- add instructions to run docker gush so that it mounts foldr HOT 5
- gh-pages has been left out?
- finish updating .gush.yml via docker
- [RFC] Scripts under `.git/hooks/` may contain calls to undefined commands HOT 8
- remove more commands? HOT 9
- docker instructions HOT 1
- [RFC] remove the --switch option for pull-request:merge?
- [UX] Detect and warn when fork is missing for pull-request:create HOT 2
- Error recovery for pull-request/issue : create
- Is this project abandoned? HOT 4
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 gush.