Git

Questions and information about Crank Software's Storyboard Designer

Moderator: jamiev

Git

Postby Ray » Mon Jul 09, 2018 1:52 pm

Hi,

We are using Git to do version control. Shall we keep tracking the file ".xxx_settings"?
If we put this file in Staged Changes, and then have merge conflicts in this file during merge. Is there any guideline or protocol to fix the merge conflict?

Thanks
Ray
 
Posts: 42
Joined: Wed Apr 06, 2016 3:32 pm

Return to Storyboard Designer

Who is online

Users browsing this forum: No registered users and 1 guest

cron