Here are the docs from github: https://help.github.com/articles/about-pull-request-merges/
Based on those and using squash and commit for some of my merges, it looks like it does what we want: just one commit for the merge of the feature branch. Note that "rebase and merge" in github does not actually work exactly like it does in git (see above link). On Thu, Oct 5, 2017 at 4:15 PM, Jared Stewart <jstew...@pivotal.io> wrote: > Does anyone happen to know if “squash and merge” also does a rebase or > not? I’ve been hesitant to use that button since I’m not sure what exact > sequence of git commands it corresponds to. > > > On Oct 5, 2017, at 3:59 PM, Jason Huynh <jhu...@pivotal.io> wrote: > > > > I think we can also use "squash and merge" if wanting to squash commits > > before merging. This would allow you not to have to force push every > time. > > > > On Thu, Oct 5, 2017 at 3:15 PM Jinmei Liao <jil...@pivotal.io> wrote: > > > >> On the PR UI page, you can do that by pull down the the menu when you > are > >> ready to merge. Remember to use "Rebase and merge". > >> > >> > >> > >> > >> Not sure if this is useful to everyone, but when I push a subsequent > commit to my feature branch, I always use "force push", so that it's only > one commit I need to rebase to develop. > >> > >> > >> On Thu, Oct 5, 2017 at 3:00 PM, Jared Stewart <jstew...@pivotal.io> > wrote: > >> > >>> I’ve been seeing a lot more merge commits on develop since we moved to > >>> Gitbox. Just wanted to give everyone a friendly reminder to please > rebase > >>> before merging to keep our git history tidy and readable. > >>> > >>> Thanks, > >>> Jared > >> > >> > >> > >> > >> -- > >> Cheers > >> > >> Jinmei > >> > >
