Compare Git rebase and merge strategies. Understand the pros and cons of linear vs branching histories, and learn the golden rule of rebasing.