Details
-
Bug
-
Status: Resolved
-
Major
-
Resolution: Fixed
-
1.10.0
-
None
Description
When resolving a file edit vs move conflict, the conflict resolver will sometimes search through history back all the way to r0. This takes an unreasonable amount of time and should be avoided if possible.