forked from desktop/desktop
-
Notifications
You must be signed in to change notification settings - Fork 32
Update from master as "Rebase" instead of "Merge" #175
Copy link
Copy link
Open
Labels
acceptedI agree this feature/bug is valid, and will work on it when I get a chanceI agree this feature/bug is valid, and will work on it when I get a chancedelegatedSomeone else is currently working on this issue, see comments for detailsSomeone else is currently working on this issue, see comments for details
Metadata
Metadata
Assignees
Labels
acceptedI agree this feature/bug is valid, and will work on it when I get a chanceI agree this feature/bug is valid, and will work on it when I get a chancedelegatedSomeone else is currently working on this issue, see comments for detailsSomeone else is currently working on this issue, see comments for details
The feature request
Some repos are working with a "rebase"-only flow. "Update from master/main" currently only merges in.
I'd rather not introduce a new option in the menu in this case, but maybe rather make it configurable per repository what "Update from ..." does, so you can pick whether it starts a rebase or merges in.
Proposed solution
(again like for the other feature reqs: I can implement but would love your thoughts. I figure this one might be more controversial than the others. But I really love the 1-click solution with "Update from" instead of going through the "Rebase current branch" → select master flow.)
Additional context
No response