+1 rebase and merge aren't weird things that git does, they are fundamental to any version control system. They are pretty much necessary for collaboration or i

+1 rebase and merge aren't weird things that git does, they are fundamental to any version control system. They are pretty much necessary for collaboration or if you want to edit history.