diff --git a/.gitignore b/.gitignore
index 30e4daa..6942482 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,29 @@ pyrightconfig.json
 \#*\#
 .*.~undo-tree~
 *.db
+.git/
+.idea/
 
 # Created by https://www.toptal.com/developers/gitignore/api/python
 # Edit at https://www.toptal.com/developers/gitignore?templates=python
 
+### 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
+
+# End of https://www.toptal.com/developers/gitignore/api/git
+
 ### Python ###
 # Byte-compiled / optimized / DLL files
 __pycache__/