Comments (1)
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 offritz-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 orfritz 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.
from fritz.
Related Issues (20)
- Add filters to VLT/FORS2
- When accessing a transient while not logged in, redirect after login should be to transient page, not home
- False non-detections appear in many objects HOT 1
- Thumbnail handler falls over on PGIR alerts
- Wrong time axis on Liverpool Telescope observability plots HOT 6
- GCN page - filter sources on rejected tag HOT 2
- Short feature description
- Submitting filter names in Follow-up request form lead to unexpected results HOT 1
- Add Magellan Clay and spectrograph to instrument list HOT 1
- Add single frame photometry options to SEDMv2 follow-up menu
- P60 photometry doesn't flow to fritz
- P60 ugri exposure times HOT 2
- Reinstigation of the Fritz account expiry date field HOT 2
- Can no longer sort candidates by selected annotation HOT 3
- Order annotation sorting alphabetically HOT 1
- How to get Fritz token HOT 7
- How to get Fritz token HOT 1
- Remove Kowalski as a submodules? HOT 7
- "fritz --init" failure
- Automatic IAU source naming does not work in the archive endpoint HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
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.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from fritz.