[Bug]: Saving db.json in git and working on different branches, resolves in unsolveable merge conflicts.

[LazerLars]

Describe the bug

I use masscode on muliple computers, so i store my db.json file in git to maintain and presvere the data (maybe this is not ideal :D i dont know :) ) So i have my main on git, then on computer 1 i have branch.x and doing new addtions and on computer 2 i have branch.y doing other adtions and edits. Then i merge the branch.x to main without a issue, and then i want to pull latest changes from main to branch.y / want to merge branch.y to main, then I can't since they can somehow be stored with the same ids/unique identifiers. If you dont see this is as i bug since i store the db.json in git then please delete the bug report. Even when the above is said, i freaking love your tool :) Nice job. It's so beautiful and im using it 5 days a week.

To reproduce

Described in the bug desc.

Version

3.11.0

OS

Win 11

Validations

• [X] Follow our Code of Conduct
• [X] Check that there isn't already an issue that reports the same bug to avoid creating a duplicate.
• [X] Check that this is a concrete bug. For Q&A open a GitHub Discussion.

[LazerLars]

Unfortunately i fixed the merge conflict by just hard copying the new added elements and edits to a new branch branched out from main. And i didnt think of before after documention the journey so you had some data to investigate on. I will try to remember that next time :D

[antonreshetov]

@lazerlars It is unlikely that such a case can be classified as a bug, as there is direct intervention in the database.

[LazerLars]

Wow that was fast you replied :D Aight man, lemme close this bad boy then 🗡️