diff --git a/.gitignore b/.gitignore
index 43a2408..793a947 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,23 @@ __pycache__/
 *.pyc
 # Python dynamic modules
 *.pyd
+
+### Git ###
+
+# Created by git for backups. To disable backups in Git:
+
+# $ git config --global mergetool.keepBackup false
+*.orig
+
+# Created by git when using merge tools for conflicts
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*_BACKUP_*.txt
+*_BASE_*.txt
+*_LOCAL_*.txt
+*_REMOTE_*.txt
 
 ### Windows ###