-
Type:
Bug
-
Resolution: Cannot Reproduce
-
Priority:
Highest
-
None
-
Affects Version/s: 2.1.10.0
-
Environment:
Using Bit Bucket and Git on Widows 7 64-bit machine. The version of Source Tree that I have does not show up in the affected versions list, however this should be a released version.
-
Severity 1 - Critical
Trying to resolve merge conflicts when merging two branched. When selecting resolve conflict using "Theirs" it reports an error stating the the files are locked and to check if there are any other programs running the files. I have ensured that no other programs are currently using the files, so why do I still get the error?
