How to avoid migrations merge conflicts with multiple team members working in parallel
The current problem is, whem multiple team members work in parallel on the same project, we have to deal with a lot of merge conflicts in journal, snapshots, and migrations when merging prs. current solution that we found is rebase main into feature branch, drop all migraitions so migrations are up to date with main and then generate single migration that includes all changes made on the feature branch. It works, but maybe there is any easier approach to deal with that?
