Skip to content

Fix JHU branches #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
6 tasks done
krivard opened this issue Aug 19, 2020 · 3 comments · Fixed by #229
Closed
6 tasks done

Fix JHU branches #228

krivard opened this issue Aug 19, 2020 · 3 comments · Fixed by #229
Labels
bug Something isn't working

Comments

@krivard
Copy link
Contributor

krivard commented Aug 19, 2020

The JHU commit log has become a horror show. Here's what seems to have happened:

  1. deploy-jhu was developed iteratively, with lots of debugging commits. This is normal.
  2. Once it worked, I rebased for a merge into main. This is something I would like to become normal.
  3. 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.
  4. 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)
  5. 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-jhu to build the new code
  • Destroy all outdated branches
@krivard krivard added the bug Something isn't working label Aug 19, 2020
@krivard
Copy link
Contributor Author

krivard commented Aug 19, 2020

PR into deploy-jhu is failing; need to address, merge, then clean up the branch ecosystem

@krivard krivard reopened this Aug 19, 2020
@krivard
Copy link
Contributor Author

krivard commented Aug 21, 2020

Ping @jsharpna once this is fixed

@krivard
Copy link
Contributor Author

krivard commented Aug 28, 2020

@jsharpna all done!

@krivard krivard closed this as completed Aug 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant