by Davo Smith.
To quote Tim's original post: The --strategy-option=patience bit bascially tells git to try harder at sorting out merge conflicts.
Basically, it is non-essential, it just tells git to try a bit harder than usual.
