Unity project hosting platform plasticscm (learn to use 2)

Mainly understand about PlasticSCM Multi branch development during project trusteeship , Solution in case of conflict when merging to the main branch .

Initial scene

1： Create branches from different nodes , Modify the project .

Branches created under different nodes modify the project , When merging to the main branch , There will be no conflict .

2： Create multiple branches under the same node , Modify different objects in the same scene .（ Resolve conflicts automatically ）

When merging the second branch , Will prompt for merge conflicts , But the changes made under the branch do not affect each other , that PlasticSCM You can help us resolve conflicts by yourself .

Click directly to resolve the conflict ,PlasticSCM Can help us resolve this conflict .
3： Create multiple branches under the same node , Modify the same object in the same scene .（ Resolve conflicts manually ）

Here I use code to show , It's easy to see .
Initial script ：
speed The initial value of 5.5
（1） First create a branch to reduce speed Value


At this point, the branch is under speed The value of is 4.5
（2） Create another branch under the parent node to increase speed Value

Open the script , And we can see here speed The value of is back to 5.5, Is the parent node speed The state of
And then modify speed Value , This increase

take speed From 5.5 Add to 6.5, And upload
At this point, the status of the branch and node

Then merge branches to the main branch , There will be conflict , We need to resolve the conflict manually
I only keep speed=6.5f This is a case , Then exit and save

And then you can see ,PlasticSCM The conflict is over .

go back to unity You can see in the script speed The value of is the value we reserved before .