Fix oppia#5620: Add check for git conflict markers (oppia#5624)

* Fix oppia#5620: Add check for git conflict markers * Change error message * conflict --> conflicts
MgowanoJr · Sep 6, 2018 · 54972e4 · 54972e4
1 parent 30eb4ba
commit 54972e4
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/scripts/pre_commit_linter.py b/scripts/pre_commit_linter.py
@@ -92,6 +92,14 @@
         'message': 'Please make sure all files only have LF endings (no CRLF).',
         'excluded_files': (),
         'excluded_dirs': ()},
+    '<<<<<<<': {
+        'message': 'Please fully resolve existing merge conflicts.',
+        'excluded_files': (),
+        'excluded_dirs': ()},
+    '>>>>>>>': {
+        'message': 'Please fully resolve existing merge conflicts.',
+        'excluded_files': (),
+        'excluded_dirs': ()},
     'glyphicon': {
         'message': 'Please use equivalent material-icons '
                    'instead of glyphicons.',