You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I've now investigated Stacked Git, and I don't think it gives us much advantage over rebasing.
What I suggest we do:
Pin skyportal in fritz to fritz-marshal/skyportal
Maintain a list of patches as individual branches on top of that repo. In other words, we have branches patches/dockerfile, patches/config etc.
The master branch of fritz-marshal/skyportal is constructed with a so-called octopus merge: git merge patches/dockerfile patches/config. We provide a tool to automate updating SkyPortal and doing the octopus merge, so a fritz dev can simply type: fritz skyportal update to bring in latest master or fritz skyportal apply-patches to apply patches to a vanilla SkyPortal.
We then push the new (merged) branch to fritz-marshal/skyportal and pin.
The patch branches should each address one feature, and be self contained. The patch branch is updated as normal, by adding git commits.
The advantage of this schema over simply keeping patches on top of SkyPortal itself (which would require frequent rebases and rewriting of patches) is that we get to track the history of changes made to SkyPortal.
Use F-specific forks of SP and K.
The text was updated successfully, but these errors were encountered: