> I've been doing this in git for years. You've missed a crucial detail. You've both been doing it, but only one of you was using a tool that needed rebases t

> I've been doing this in git for years. You've missed a crucial detail. You've both been doing it, but only one of you was using a tool that needed rebases to pull it off.