sideSquash.md

• Save on laptop

  • If I'm on branch vertex, fork off vertex-tmp-*, if I'm alredy on these do nothing
  • Commit w/o real msg

• Whenever I say "test" (or save)

  • Push the current (tmp branch) to strats1
    • This has to be configured to listen to vertex-NAME-HIGHERST-N, or something
  • On strats1, check out and build (aborting previous builds)
    • (When build finishes update cluster state)

• "Save" to the vertex branch:

  • Find last common ancestor (LCA, git merge-base vertex vertex-tmp*) of vertex-tmp* and vertex.
  • Make a commit on a new branch (merge-) with LCA as parent, having all changes from vertex-temp
    • git checkout LCA -b merge-*
    • git merge --squash vertex-tmp-*
    • git commit (write msg here)` (might fail if prev op returned 0 for UP TO DATE)
  • Merge back into vertex
    • git checkout master
    • git merge tmp-0
    • git branch -D master-tmp-1
    • git branch -d tmp-0