dev: Add Git to gitignore

Author: clemlesne

.gitignore

@@ -1,9 +1,24 @@
-# Created by https://www.toptal.com/developers/gitignore/api/osx,linux,dotenv,python,windows,visualstudiocode
-# Edit at https://www.toptal.com/developers/gitignore?templates=osx,linux,dotenv,python,windows,visualstudiocode
+# Created by https://www.toptal.com/developers/gitignore/api/osx,linux,dotenv,python,windows,visualstudiocode,git
+# Edit at https://www.toptal.com/developers/gitignore?templates=osx,linux,dotenv,python,windows,visualstudiocode,git
 
 ### dotenv ###
 .env
 
+### 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
+
 ### Linux ###
 *~
 
@@ -264,7 +279,7 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.toptal.com/developers/gitignore/api/osx,linux,dotenv,python,windows,visualstudiocode
+# End of https://www.toptal.com/developers/gitignore/api/osx,linux,dotenv,python,windows,visualstudiocode,git
 
 # See: https://github.com/clemlesne/gitops-version
 .version.cache