Merge pull request #572 from mcuadros/reset

Worktree.Reset refactor and Soft, Merge, Hard and Mixed modes