Mac OS guide

[Devin]

I am just looking for a clear guide on how to use Plastic/SemanticMerge/GitSync on mac os

Mac appears to be much less important than windows, so digging around all the docs doesn't feel like the most productive strategy

I actually setup a PlasticSCM cloud edition account, and downloaded PlasticSCM for mac.

The first thing I want to do is import a git repository, and see how the history is improved. I'd love to connect to github too, and see how that all works.

In my opinion, the JavaScript community has become quite acclimated to jumping to the next technology. I think if merging could be made easier, and diffs easier to understand, lots of developers would download that "git client". Throw in speadsheet diff, image diff, etc, etc, etc, more and more people start downloading this "git client". I think this is a great evolution, and a great platform to focus on, second to all the game development concerns. It also proves how seamless a transition from git to plasticscm could be, develops trust with PlasticSCM. Of course, if we want improved merging and diffs online, we should switch to PlasticSCM, and my hope is that most people don't really have to worry about the fact that _it is not git_ - business, designers, etc, just know that code is being stored/tracked on PlasticSCM.com now.

Another amazing feature (I don't think exists anywhere) would be getting notified in an IDE which files are dirty on other branches. I think this could only work by putting Plastic in "centralized" mode, but, there's no reason "git status" couldn't be shared with some sort of "collaboration" server. The whole idea here is to avoid creating merge conflicts in the first place. When using Git 100%, a third-party tool may frequently identify merge conflicts that PlasticSCM can merge just fine. Developers will figure this out over time, of course. (I'm really rambling here, but, developers could use Dropbox+git+git workspaces and get an interesting workflow, but, it's quite hacky, will result in a lot of "some other program changed the saved this file from underneath you" issues)

Ultimately I just want help minimizing merge conflicts, and improving diffs for javascript, jsx, typescript, tsx, and scss

[calbzam]

Hi,

Quote

In my opinion, the JavaScript community has become quite acclimated to jumping to the next technology. I think if merging could be made easier, and diffs easier to understand, lots of developers would download that "git client". Throw in speadsheet diff, image diff, etc, etc, etc, more and more people start downloading this "git client". I think this is a great evolution, and a great platform to focus on, second to all the game development concerns. It also proves how seamless a transition from git to plasticscm could be, develops trust with PlasticSCM. Of course, if we want improved merging and diffs online, we should switch to PlasticSCM, and my hope is that most people don't really have to worry about the fact that _it is not git_ - business, designers, etc, just know that code is being stored/tracked on PlasticSCM.com now.

We apprecaite your feedback. Are you aware of gmaster? We use the Semantic technology from Plastic SCM on a git GUI (www.gmaster.io). But I'm afraid it's only available for Windows.

Quote

 

Another amazing feature (I don't think exists anywhere) would be getting notified in an IDE which files are dirty on other branches. I think this could only work by putting Plastic in "centralized" mode, but, there's no reason "git status" couldn't be shared with some sort of "collaboration" server. The whole idea here is to avoid creating merge conflicts in the first place. When using Git 100%, a third-party tool may frequently identify merge conflicts that PlasticSCM can merge just fine. Developers will figure this out over time, of course. (I'm really rambling here, but, developers could use Dropbox+git+git workspaces and get an interesting workflow, but, it's quite hacky, will result in a lot of "some other program changed the saved this file from underneath you" issues)

Ultimately I just want help minimizing merge conflicts, and improving diffs for javascript, jsx, typescript, tsx, and scss

 

In order to minimize the merge conflicts, the recommened workflow is working centralized with locks. This us for instance the main workflow for game studios working with assets.

If you are using Gluon, the GUI will show you the specific locked files and who owns the lock. Only one user will be able to check-out the file.

https://www.plasticscm.com/documentation/administration/plastic-scm-version-control-administrator-guide#Chapter7:Configuringexclusivecheckout(Lock)

Regards,

Carlos.