Merge pull request #5354 from gambol99/ignore_merge_conflict

Git Ignore - Merge Conflict Files
kubernetes · Jun 20, 2018 · c862fd6 · c862fd6
2 parents cd820a6 + 418fa45
commit c862fd6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# git mergetool
+*.orig
+
 # Go embed files?
 *.go-e
 
@@ -81,4 +84,4 @@ default.etcd
 
 # Ignore awesome_bot markdown links check output
 ab-results-*.json
-addons/prometheus-operator/tmp # cloned git repo
+addons/prometheus-operator/tmp # cloned git repo