-
Notifications
You must be signed in to change notification settings - Fork 16
Closed
Labels
bugSomething isn't workingSomething isn't working
Description
The JHU commit log has become a horror show. Here's what seems to have happened:
deploy-jhuwas developed iteratively, with lots of debugging commits. This is normal.- Once it worked, I rebased for a merge into main. This is something I would like to become normal.
- Either I did not force-push the rebased changes into
deploy-jhu(bad practice; if we rebase to merge onto main we should always update the source branch) or someone with stale history force-pushed their old copy of the chattier commit record ontodeploy-jhu. - I left a pile of JHU branches in the repository (this is bad practice; it should always be clear which branch to base changes off of, which means the only ones up there should be main, the deploy branch, and active dev branches)
- Eu Jing based his diff-based issue-builder changes off of one of those branches, and merged to
deploy-jhu, resolving conflicts and cementing the chattier commit record
What needs to happen now is:
- Check whether the chatty record got merged into
main. If so, this gets more complicated, so hopefully not. - Bring the rebased version of the jhu deployment up to date with main
- Apply Eu Jing's changes to the clean branch
- Force-push into
deploy-jhu - Trivial PR from main into
deploy-jhuto build the new code - Destroy all outdated branches
Metadata
Metadata
Assignees
Labels
bugSomething isn't workingSomething isn't working