You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository has been archived by the owner on Nov 22, 2022. It is now read-only.
Describe the feature or problem you'd like to solve
At alpine/aports we need all commits to be rebased against master before merging so there are no merge commits and we have a nice linear history (see screenshot below)
It would be very convenient to have a flag --rebase or preferably a way to automatically rebase whenever a merge request needs it due to the situation above.
Propose a Solution
Have a flag --rebase that does the equivalent of glab mr rebase before doing the merge itself
Additional context
This helps with a race condition where a rebase might end before and the attempt to merge after another person has pushed.
Start rebase
Rebase finishes
Someone pushes to trunk or merge another MR
Attempt to merge
Has to rebase again because of 3
having --rebase while not completely eliminating the race condition (unlike GitHub does with the rebase method for merging a pull request) greatly reduces the possibility of it happening.
The text was updated successfully, but these errors were encountered:
This issue has been automatically marked as stale because it has not had recent activity. We haven't had the time to address it yet, but we want to keep it open. This message is just a reminder for us to help triage issues.
Describe the feature or problem you'd like to solve
At alpine/aports we need all commits to be rebased against master before merging so there are no merge commits and we have a nice linear history (see screenshot below)
It would be very convenient to have a flag
--rebase
or preferably a way to automatically rebase whenever a merge request needs it due to the situation above.Propose a Solution
Have a flag --rebase that does the equivalent of
glab mr rebase
before doing the merge itselfAdditional context
This helps with a race condition where a rebase might end before and the attempt to merge after another person has pushed.
having
--rebase
while not completely eliminating the race condition (unlike GitHub does with the rebase method for merging a pull request) greatly reduces the possibility of it happening.The text was updated successfully, but these errors were encountered: