Correct mistakes with interactive rebase

[wnagrodzki]

Instead of making a commit with a fix, squash it with the commit the fix should be applied to.

[pwetrifork]

The guideline should explicitly mention that this applies only if the original commit hasn’t been pushed yet