From 9c83da4bfda196b3e00009badfb195d7ceb5847d Mon Sep 17 00:00:00 2001 From: Toh4iem9 Date: Fri, 22 Aug 2025 17:25:25 +0200 Subject: [PATCH] chore: git --- .gitignore | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 ###