Git gets all changes in the dialogues

Announcements, support questions, and discussion for the Dialogue System.
Post Reply
Cussa
Posts: 22
Joined: Sat Jun 03, 2023 3:50 am

Git gets all changes in the dialogues

Post by Cussa »

Because of the way the tool is created, any change in the layout (x, y or zoom), it will be sent to git as a change.

This means that if more than one person is working on the database dialogue, there will be several conflicts to be resolved.

Is there any possible solution for this case?
Or is there any reason why that could not be moved to a separated file, so that. could be included in the gitignore?

Many Thanks

Cussa
User avatar
Tony Li
Posts: 20769
Joined: Thu Jul 18, 2013 1:27 pm

Re: Git gets all changes in the dialogues

Post by Tony Li »

Hi,

Only one person at a time should edit a dialogue database. Treat a dialogue database asset like other assets in your project such as animator controllers and image files. For example, if two people make changes to an image file at the same time, Git won't be able to resolve the differences. Dialogue databases contains pointers between different pieces of data inside them. Even if Git could merge two different versions of text, the pointers would be invalidated.

Instead, if you have multiple writers, use multiple databases (see Working With Multiple Databases) or use any of the multi-user external editors that the Dialogue System can import, such as articy:draft, Arcweave, Celtx, etc.
Post Reply