Coder Social home page Coder Social logo

Comments (1)

stefanv avatar stefanv commented on August 26, 2024

I've now investigated Stacked Git, and I don't think it gives us much advantage over rebasing.

What I suggest we do:

  1. Pin skyportal in fritz to fritz-marshal/skyportal
  2. Maintain a list of patches as individual branches on top of that repo. In other words, we have branches patches/dockerfile, patches/config etc.
  3. 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.
  4. 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.

from fritz.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.