diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-05 15:57:57 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 22:16:35 +0300 |
| commit | 54bfe70795e289b86485b2a57d72b6711e4994bd (patch) | |
| tree | 6cba31fce7354bd6f07daf31f057b6fa233e2589 /app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | |
| parent | c4142cf9c0c0b217034c60a0a973d2e96b17a428 (diff) | |
Add more tests to check conflicts resolution
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 index 83bcc3f51aa..5c5c65f29d4 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 @@ -321,7 +321,8 @@ let numberConflicts = 0; let resolvedConflicts = Object.keys(file.resolutionData).length - // We only check if + // We only check for conflicts type 'text' + // since conflicts `text_editor` can´t be resolved in interactive mode if (file.type === CONFLICT_TYPES.TEXT) { for (let j = 0, k = file.sections.length; j < k; j++) { if (file.sections[j].conflict) { @@ -334,6 +335,7 @@ } } } else if (file.resolveMode === EDIT_RESOLVE_MODE) { + // Unlikely to happen since switching to Edit mode saves content automatically. // Checking anyway in case the save strategy changes in the future if (!file.content) { |