Strategy for merging branches?

General
1

Hi there,

I wanted to have a master branch and a dev branch alongside all other branches, in future maybe even staging(?) and was wondering if there is any merging strategy to get the always up to date DB changes from production other than deleting the branch and re-creating the branch? Because delete+recreate would mean to update credentials also.

Or how would the typical workflow look like?

Thank you!

2

Hi @ThibaultJanBeyer ,

Do you mean schema or data merge?
We currently do not have a schema merge process.

It is also possible to se third-party tools such as Prisma or Drizzle-kit for porting schema migrations to the main branch.

3

Yes, schema and data

4

We are considering adding support for schema merge, but we do not have a timeline yet.

1 Like