3 ms·
The issue with reconciling state is that you can have multiple branches at different times. Forgive the crude diagram but I’m on my phone. MAIN.1->MAIN.2
by dijit 5y ago
The issue with reconciling state is that you can have multiple branches at different times. Forgive the crude diagram but I’m on my phone.
MAIN.1->MAIN.2
\
FEAT.?
If you have many branches and you want to bug fix on one or your schema needs to stay how it is for a certain release window then you quickly run into issues with the serialised version approach.
- deleted 5y ago[deleted]
- ww520 5y agoAll the schema delta files are checked into repository. They themselves can be version tracked. Different branches can have different versions of a delta file. Merging branches need to merge the changes of the delta file. Might need special attention since merging sql statements needs special care. Edit: Or you might choose to be explicit with the version of the delta files in a branch. Each branch has its own delta file naming format. When merging into main, roll the changes from all delta files into a new main delta file. If main has moved forward a lot, you have to insert the changes carefully.