Skip to content

Instantly share code, notes, and snippets.

@sam-github

sam-github/gist:d187d8569105480c4cce69101027033e

Created October 6, 2016 20:05
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save sam-github/d187d8569105480c4cce69101027033e to your computer and use it in GitHub Desktop.
Save sam-github/d187d8569105480c4cce69101027033e to your computer and use it in GitHub Desktop.
Download ZIP
How github PRs should work
Raw
gistfile1.txt
Unfortunately, they don't support our work flow... rebase and make a merge commit. sigh. the problem is they are
fighting and fighting from adding a couple of checkboxes and trying to just name workflows. squashing, rebasing,
and merge vs fast-forward are independent decisions, there are more possibilities than this weird UI can possibly
reflect.
When I'm github PM, I will make them do two settings for the repo:
- allow unrebased=yes/no (default yes)
- use-merge-commit=yes/no (default yes)
And then the PR merge button will have only two possibilities: squash=yes/no (default no)
This would cover all useful possibilities, and be much simpler.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment