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
The JHU commit log has become a horror show. Here's what seems to have happened:
deploy-jhu was 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 onto deploy-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)
Uh oh!
There was an error while loading. Please reload this page.
The JHU commit log has become a horror show. Here's what seems to have happened:
deploy-jhu
was developed iteratively, with lots of debugging commits. This is normal.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
.deploy-jhu
, resolving conflicts and cementing the chattier commit recordWhat needs to happen now is:
main
. If so, this gets more complicated, so hopefully not.deploy-jhu
deploy-jhu
to build the new codeThe text was updated successfully, but these errors were encountered: