TouchGFX Designer project and Git

[COSEBE]

Hi,

We are developping a touchgfx project in team.

We use github and each time we want to merge branch, we have a problem with touchgfx file and texts.xls file.

How to develop as a team on touchgfx?

Regards,

Sébastien

[Martin KJELDSEN]

Either:

1) Have someone dedicated to updating the text sheet

2) Communicate to avoid conflicts

3) Write an intermediary layer that generates the texts.xlsx file based on a more easily merge-able format (text)

4) Modify .gitattributes to use tools that can merge excel sheets for .xlsx files

/Martin