SPJ/SLL: common git merge conflicts

Feature requests
1

I’d like fewer merge conflicts when rebasing or merging SPJ and SLL files. I thought I would mention a few that might be worth reconsidering for future formats, or splitting into their own file that could be .gitignored.

In the SLL file, there is an upside-down JPG encoded in the “image” field. This seems to be the project preview image, and is updated when the project is saved with a new screen chosen. It’s an easy one to fix since we don’t mind it being wrong, but means we nearly always have to merge the SLL. It’s also makes the SLL of the largest parts of our codebase in git.

In the SLL/SPJ files, nidcnt, backup_cnt, autosave_cnt all increment slowly over time. Backup_cnt and autosave_cnt are trivial to merge, but I’m not sure about nidcnt.

1 Like
2

Hi, thanks for the feedback, we’ll reconsider how we could improve collaboration with Git

1 Like
3

I think I’ve identified two more:

  • If one or more screen is added on two or more branches.
  • If one or more event is added on two or more branches.