Prompt for continue on CONFLICT_MISMATCH
types/git: reset branch before upgrading
Merge branch 'feature/conflict-mismatch'