Is there a fix for this? Is anyone reading these comments? This issue is over 7 years old. I'm using version 5.7.8.97, which is very new, and I still cannot resolve all conflicts. I have 546 and I'm getting paid a senior level developers salary to right-click and select "use source control version" on every single item. That may take an hour. This is nonsense.
Is there a fix for this? Is anyone reading these comments? This issue is over 7 years old. I'm using version 5.7.8.97, which is very new, and I still cannot resolve all conflicts. I have 546 and I'm getting paid a senior level developers salary to right-click and select "use source control version" on every single item. That may take an hour. This is nonsense.