Stay away from rebase? What are you nuts? What the hell is everyone doing working on master anyway? Make your own working branch and merge it when it's ready.

Stay away from rebase? What are you nuts? What the hell is everyone doing working on master anyway? Make your own working branch and merge it when it's ready. Don't mess with master if you're working with others. If you are working on master (or merging to master, or doing something with master), merge and push right away, and if someone does something else upstream in-between, then rebase yours on top of it. If you have local changes, and other people pushed changes to your upstream remote, first of all, you should have pulled before making changes (you know that's usually the reason) which would have done a nice fast-forward merge with no merge commit. If your commits are just local anyway, no one cares if you just rebase so it's cleaner! It's equivalent to having pulled first and then made changes. Exactly the same. No one wants to see an unnecessary merge commit anyway, that's just annoying. All of this makes sense. Merge works, rebase works, sometimes they do the same thing, sometimes one's better, sometimes you should just not be dumb. What's the problem? Geez, it's just git.