[rspec-users] [cucumber] Cucumber and CI

Pat Maddox pat.maddox at gmail.com
Tue Feb 24 13:56:18 EST 2009


On Tue, Feb 24, 2009 at 10:16 AM, Mark Wilden <mark at mwilden.com> wrote:
> On Tue, Feb 24, 2009 at 1:17 AM, Matt Wynne <matt at mattwynne.net> wrote:
>>
>> See particularly the notes about squashing commits - this allows you to
>> commit really often in your local branch, then merge these commits together
>> before you push them into the main source control repository.
>>
>> You can even use git commit --amend to commit on red (e.g at the end of the
>> day) and then change that commit later.
>
> Another workflow (which I don't personally use) is to continually git
> commit --amend, changing the commit message each time. This avoids the
> rebase step before pushing, but of course you don't have the
> checkpoints.

Much better to rebase -i to clean up a bunch of little commits, imo.
Gives you all the flexibility in the world when developing, then when
you're ready to share you can assemble nice independent, meaningful
changes.

Pat


More information about the rspec-users mailing list