Your Privacy Matters: We use our own and third-party cookies to improve your experience on our website. By continuing to use the website we understand that you accept their use. Cookie Policy
20
Collaborating in a team based on GIT (Merging etc.)
posted

Hello,

is it possible to collaborate on GIT with a team. Is there an option to merge files. i saw that they are structured in XML so in theory this should be possible.
Thanks for a quick feedback!

Cheers Stefan 

  • 1655
    Verified Answer
    Offline posted

    Hi, Stefan!

    Thanks for contacting us.

    Just to confirm that I understood your question, do you want to use GIT as a source code control system for your prototypes? If it so, you can use it. Just keep in mind that we don't provide any merge mechanism, so for example, if you merge a screen, it might get corrupted. If you want to use GIT, you always have to do a copy and then decide which version you want to keep.

    One way to avoid merges (and probably issues on the screens), is to tell git that Indigo Studio files should be treated as binary, so that when a conflict happens, you will  have to choose manually between your file and the one you are merging in.

    To do that, you can add a .gitattributes file on the root of the repository, with the following content:

    *.screen binary
    *.screenpart binary
    *.stylesheet binary
    *.story binary
    *.proj binary

    It would also make sense to add the following lines to the .gitignore file:

    .autorecover
    share.history

    To avoid committing temporary files.

    Please, let us know if we can be of further assistance.

    Best regards,
    Claudia
    Indigo Studio Team