task conflict

task conflict
the conflict about : multi task conflicts, and Implicit task from explicit object.

scenario1:

parallel development for 75plat and 85plat.
some objects change only for 85plat new feature
some objects change only for 75plat bugfix.
some objects change for both 75plat and 85palt togather.

when we create tasks for 75plat, just use 75palt release, and only associated with those objects which changed for 75plat.
when we create tasks for 85plat, just use 75palt release, and only associated with those objects which changed for 85plat.
when we change the object can be shared by 75plat and 85plat, just create tasks for 75plat at first, if no conflict, no lint error,can be build, we can copy to 85plat (or we can create a new 85plat task.).

if we create one task, some objects for 75plat, some objects for 75plat and 85palt, their will have some conflicts. we had to associated some object with a new task, dis-associated those object with the conflict task.

scenario2:

we have two components, one for 75plat, another for 85palt. they use the same objects instance.
from the object history, you can find that there are parallel version history. one line for 75, oneline for 85.
if the object's task release is 75plat, we just add the task to 75plat ITITF folder.
if the object's task release is 85plat, we just add the task to 85plat ITITF folder.
if the parallel version be merged, the merged object have two associated tasks: 75palt task and 85palt task.our show conflicts script will show some conflict.
it is normal, because the CM Synergy want to check the pre-version for the merge object. of cause, there will have conflict.
How to resolve the conflict now? just copy the conflict tasks to our task ignore file.

转载于:https://www.cnblogs.com/applegirl/archive/2005/09/23/242937.html