— Look at the project to see which version of the object is being used.
— Look at the object history to see the relationship between the object in conflict and the object that is being used.
— Look at which tasks are associated with the objects you are interested in.
— Consider whether to add its task to the update properties for the project. If you want to include the task, find out why it is not being included already. Is the release value for the task incorrect?
— If you do not want to add the task for the object to the update properties for the project, look at its successors. Consider whether to remove the tasks from the update properties for the project. If you want to remove the tasks, find out why they were included. Are the release values set incorrectly?
Remember that each team has its own unique process and method for tracking changes. This impacts what your team considers to be a conflict. One team might consider a specific conflict as part of their methodology, and that team would turn off that particular conflict. Another team might view that same conflict as a problem to be corrected immediately. Be sure that your team agrees on the conflicts to be addressed as early in your development process as possible.