Keep calm and continue rebasing

Re:Keep calm and continue rebasing by dasil003 on Thursday May 02, 2013 @09:06AM (#5644192)

That's the type of thing I use rebase -i for though. My concern with squashing is that quite often you have multiple stable points in the development of a feature. The order that those states were reached is informative to reviewers and I wouldn't want to make a habit of squashing them away.

I think focusing on committing green test states often leads to faster development and more focused thinking, and I'd prefer to see this approach represented in the final commits rather than getting in the habit of squashing days and days of work into single mammoth commits.

[ Parent | on HN ]

Re:Keep calm and continue rebasing by ShellfishMeme on Thursday May 02, 2013 @09:43AM (#5644380)

I think you're both talking about the same thing. Basically, if you realize you had a typo somewhere in an early commit, or some other random easily fixable error that you simply overlooked and thus isn't part of the evolution of development, you should use rebase -i to squash the fix commit together with the one that introduced the error.

It's not about squashing together the entire history of development.

[ Parent | on HN ]

Re:Keep calm and continue rebasing by tuxie_ on Thursday May 02, 2013 @09:55AM (#5644448)

:+1:

[ Parent | on HN ]