git .BACKUP .BASE .LOCAL .REMOTE files

Question

We\'re getting git installed here at work for a project and I\'m playing around with it with another co-worker.

I\'ve been resolving some choreographed merge conflicts b

Answer 1

In Tortoise, go to setting and uncheck "Backup original file" (one time operation) Next time you open it you can do a regular merge, Tortoise will create .base, .backup, .local, .remote, but when you save the merge Tortoise will automatically remove this files.