[FEATURE]: Documentation around conflicts

### Describe what you want

I cannot seem to find any documentation around how to handle conflicts in Drizzle, working on a codebase shared by many developers.

As an example, I have a PR that adds three new migrations. I need to rebase our main development branch which has since had 2 new migrations.
In this case, I will have conflicts on the journal/meta snapshot files and migration files numbered the same (but with different full file names).

What should be the process for handling the conflicts? Should it be a manual process of editing the journal? What happens to the snapshots files which will differ? Is there internal tooling to help with this?