Personally, I always merge with Github. Never had an issue, and never had concerns about non-linear commit history. So much is made about commit history that I

Personally, I always merge with Github. Never had an issue, and never had concerns about non-linear commit history. So much is made about commit history that I think there are flaws elsewhere in other people's processes, or people are just getting off on their git-fu. But this comment will just descend into a dull, tedious flame war. I don't care. git merge is totally fine.