Jump to content

Checking Differences of two Workspaces


camouflagedpenguin
 Share

Recommended Posts

My Problem is that i have two branches that have to be merged functionally. There is one Main Branch with several Asset Changes and one Branch with the setup of a required tool to work with Multiplayer Projects. With Diff branches and Diff CS i could not find any problem to merge those two and get a compatible branch but that is not the case. So created a new branch and tried to cherry pick things from the main branch to get it running.

It would be great to have a tool to just compare to local Installs instead to find a discripancy between the two branches because Plastic SCM is not showing me what it is or is not letting me chose what i need to do.

For Example look at the picture below. you can see that the Asset folder is loaded twice but this folder is not only loaded twice but contains different stuff which is not shown in plastic scm so i could just manually change the files needed or at least have a method to compare them. (the asset changes)

 

 

16.png

Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...