Fixes #574 - Apply Changes not working because of whitespace conflicts

Author: eamodio

CHANGELOG.md

@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
+- Fixes [#574](https://github.com/eamodio/vscode-gitlens/issues/574) — Apply Changes not working because of whitespace conflicts
 - Fixes html encoding issues with the _Search Commits_ view empty state
 
 ## [9.1.0] - 2018-12-12

src/git/git.ts

@@ -312,7 +312,7 @@ export class Git {
     }
 
     static apply(repoPath: string | undefined, patch: string, options: { allowConflicts?: boolean } = {}) {
-        const params = ['apply'];
+        const params = ['apply', '--whitespace=warn'];
         if (options.allowConflicts) {
             params.push(`-3`);
         }