desktop / desktop/desktop

Add options to `Update from upstream/*` function

Open
#16,131 0 comments 2 reactions 0 assignees View on GitHub
enhancement not-planned
Dominant language
TypeScript
Stars
21.8k
Forks
10.5k
Avg merge
1d 15h
Merged PRs (30d)
25

Description

### The feature request

Currently `Branch -> Update from upstream/*` always `Merge`s.
I'd like the option for it to instead do `Rebase and Merge`.

Or ideally, an option to disable merge commits.

### Reasoning

Our repository only has `Allow rebase merging` enabled. (We value commit history)

Meaning we really do not want users to have merge commits, and as Github Desktop really loves those, it's an unnecessary pita when less tech savvy contributors need to update their Pull Requests.

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.