playMaker

Author Topic: Good Revision Control diff/merg tool with playmaker?  (Read 683 times)

Krillan87

  • Full Member
  • ***
  • Posts: 139
    • View Profile
Good Revision Control diff/merg tool with playmaker?
« on: August 22, 2017, 03:01:48 AM »
Hi,

So me and my friend just started to use the new Unity Teams so sync our project and it works fantastic! I just wanted to ask if there is any good external tool for revisions on conflict within the project?

None of us are very good with coding (that's why we use playmaker) and it seems like a lot of external tools for resolving conflicts shows difference in code. So when we hit a conflict an open the external tool to see what is going on we are getting ton of code and we have no clue what is going on.

Is there an easy to use program here? Who easy can just highlight what FSM's that are confliction etc?

Or maybe tools like that do not exist yet?

elusiven

  • Full Member
  • ***
  • Posts: 233
  • Debt we all must pay...
    • View Profile
Re: Good Revision Control diff/merg tool with playmaker?
« Reply #1 on: August 22, 2017, 03:10:07 AM »
I don't think there is an FSM view of changes upon sync. At least not that I am aware of it. It will show all the code behind the scenes that playmaker generates I guess. Best practices for now would be to comment on every revision what was done etc, just like doing commits for github.

Krillan87

  • Full Member
  • ***
  • Posts: 139
    • View Profile
Re: Good Revision Control diff/merg tool with playmaker?
« Reply #2 on: August 22, 2017, 04:54:34 AM »
I don't think there is an FSM view of changes upon sync. At least not that I am aware of it. It will show all the code behind the scenes that playmaker generates I guess. Best practices for now would be to comment on every revision what was done etc, just like doing commits for github.

Yeah that was what i figured. But maybe in the future there will be a nice user friendly function within playmaker that let's us do that :)

jeanfabre

  • Administrator
  • Hero Member
  • *****
  • Posts: 14593
  • Official Playmaker Support
    • View Profile
Re: Good Revision Control diff/merg tool with playmaker?
« Reply #3 on: September 18, 2017, 12:15:17 AM »
Hi,

 This is problematic indeed. Hopefully yes, one day there will be a system.

 Bye,

 Jean