TouchGFX Designer project and Git
Options
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Email to a Friend
- Report Inappropriate Content
2019-12-10 6:34 AM
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
Labels:
- Labels:
-
TouchGFX
This discussion is locked. Please start a new topic to ask your question.
1 REPLY 1
Options
- Mark as New
- Bookmark
- Subscribe
- Mute
- Subscribe to RSS Feed
- Permalink
- Email to a Friend
- Report Inappropriate Content
2019-12-11 4:09 AM
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
