Add to git pre-commit hook: detect merge conflict lines before commit
Auto-Backup GitConfig
Merge branch 'work-version'