DistributedScience / Distributed-Something

Run encapsulated docker containers that do... something in the Amazon Web Services infrastructure.
https://distributedscience.github.io/Distributed-Something
Other
7 stars 3 forks source link

Rebase existing repos on this occasionally. #9

Open bethac07 opened 2 years ago

bethac07 commented 2 years ago

Presumably, as we improve things here, it would be nice to let those things trickle down.

This will be easiest for DOZC and later repos that come from the template - this StackOverflow shows how to do it (presumably it will make some merge conflicts, but those can be resolved).

For DCP/DF/DDP, we can for each make a choice (need not be the same choice for each) - 1) rename the existing repo and re-create fresh from the template or 2) incorporate upgrades manually. For DDP, and arguably even DF, they aren't in wide use which favors 1 (more work up front and lose original commit trail without visiting the old archived repo, but less work ongoing); DCP the choice is harder, but I still think for the sake of easy maintainability we may want to do it anyway.

ErinWeisbart commented 2 years ago

After conversation today: Given overwriting of history that sounds like it will occur following the rebasing in the StackOverflow question, we have decided to test this out on a not-often-used repo (DDP) before actually deciding on a strategy for the repos we are actually using (and care about history in).