> From what I understand, what we'd really like for that case is a > "squash, rebase and merge" option. Unless we've misunderstood what > "squash and merge" does and it doesn't actually create a merge commit? > > - Josh No, it doesn't. See https://github.com/blog/2141-squash-your-commits. -- Zero King