[go: up one dir, main page]

Feel stuck ?

What if the new test is too complex to pass with just one gamble ?

So it's often a good idea to :

  1. Take a break ⏸️

  2. Slow down ⏳

  3. Rollback the failing commit ⏪

    Keep a branch if needed

    git branch keep_it_for_maybe_later
    

    Then actually rollback

    git reset --hard @~
    
  4. Refactor to "make the change easy" 🧠💡

    for each desired change, make the change easy (warning: this may be hard), then make the easy change

    -- Kent Beck 2012

  5. Try to do smaller steps 👶🦶

  6. If needed, try to reapply the failing commit ⏩

    git cherry-pick keep_it_for_maybe_later --no-commit && git gamble --red
    

    It may be in conflict depending on the changes made in previous steps ⚠️