Git compatibility?

›
9gate9gate
in ORK Support
I've seen git mentioned a few times in the forums, so I assume ORK is compatible with git. But a few weeks ago my colleague added a dialog box, and I added an event. We had a merge conflict. It seems that everything other than events modify ORKProject.asset, and it gets really messy to sort through all the conflicts.

I'm wondering if anyone has experience with ORK and git? Any tips/pointers would be very much appreciated!
  • KirbKirb
    I use git for my project but I am the ONLY person dealing with ORK stuff to avoid merge conflicts. Generally, only one person can be using any aspect of ORK at one time. I'm sure there's probably a method to work collaboratively, but I've never had the need to look into it...
    Tactics RPG Grid Battle System for ORK
    ---------------------------------------
    Personal Twitter: https://twitter.com/AMO_Crate
    I make RFI! https://twitter.com/NootboxGames
  • gamingislovegamingislove
    No, ORK is not git compatible. You can't merge the ORK project asset, you can only use git to push your changes to someone else, but not merge the changes of both together.

    This will break your ORK project - it might still be playable, but most likely a lot of data selections will point to the wrong set of data (e.g. using the wrong ability or GUI box).
    Please consider rating/reviewing my products on the Asset Store (hopefully positively), as that helps tremendously with getting found.
    If you're enjoying my products, updates and support, please consider supporting me on patreon.com!
Sign In or Register to comment.