Use git checkout-index in FormResolveConflicts instead of manual FileStream read

See Issue #1456 for further details