lionhamed

Hi there,
We want to develop a game with ORK framework and every team members need to do some changes inside ORK and unity.
we have found this topic for connect unity to git:

https://robots.thoughtbot.com/how-to-git-with-unity

We done all stuff inside that topic and the unity changes is OK now.
But when two members do changes inside ORK at same time there will be conflicts and when we solve conflicts the project doesn't works.

Is there any special settings for gitignore or some solutions to solve this problems?

Regards

Kirb

I don't think you're going to be able to solve conflicts within the ORK database. I don't think it was really intended to work like that. In my team we basically have to check out the ORK Database one at a time to avoid conflicts. (But I could be wrong!)

gamingislove

The best way to use ORK with git is to not do it :)

If you want to use git with ORK, I'd recommend to only have one person work on the ORK project data at a time (e.g. working on events isn't a huge issue). The most issues come from adding or removing data from the editor, with causes ID/index updates throughout the framework, usually resulting in conflicts that are resolved wrongly, breaking the project.

This'll be better in ORK 3 (probably sometime next fall), when the system changes to asset based data instead of ID/index based all in one huge project asset.