Resolving Conflicts in Desktop Modeler

I'm trying to synch my local desktop modeler with our team server / web modeler, and there are conflicts. How do I resolve them? On the Changes dock, the "Task" drop down is greyed out for me.
2 answers

Hi Mark,

You need to find out what is changed on the team server and how it differs from your change. When you know this, most of the time you can resolve the issue by selecting 'resolve using mine' or 'resolve using theirs'

See for more info:

And also this old post with  explantation:


Go it! I needed to be in the "Project" level for tasks to be available. The answer was in that old post. Thank you!!