TortoiseMerge crash when "Edit Conflicts"
By yixia.... on May 27, 2010 08:08 (imported from Google Code)
What steps will reproduce the problem?
1.create repo on an existing folder, commit as 'master' branch
2."Git Sync..." - pull from a remote repo
3."Edit Conflicts" - crash, the error message is "can't open
.../BASE.src/..." but the folder created is REMOTE.src and LOCAL.src no
BASE.src
What is the expected output? What do you see instead?
What version of the product are you using? On what operating system?
1.4.4.0
Please provide any additional information below.
I am using windows7
BTW, do I need to add "/REMOTE.src" etc to .gitignore?
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information