Resolve conflict does not delete temporary files
By michal.wiklin... on May 24, 2010 15:35 (imported from Google Code)
What steps will reproduce the problem?
- Cause simplest conflict.
- Do merge and resolve it
What is the expected output? What do you see instead?
- Temporary files (REMOTE, LOCAL, BASE) are not be deleted.
What version of the product are you using? On what operating system?
- Tortoise Git 188.8.131.52
- Vista Business 32Bit
- Msys Git 184.108.40.206
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information