• 0 Posts
  • 12 Comments
Joined 1 year ago
cake
Cake day: July 29th, 2023

help-circle



  • I would advocate for using each tool, where it makes sense, to achieve a more intelligible graph. This is what I’ve been moving towards on my personal projects (am solo). I imagine with any moderately complex group project it becomes very difficult to keep things neat.

    In order of expected usage frequency:

    1. Rebase: everything that’s not 2 or 3. keep main and feature lines clean.
    2. Merge: ideally, merge should only be used to bring feature branches into main at stable sequence points.
    3. Squash: only use squash to remove history that truly is useless. (creating a bug on a feature branch and then solving it two commits later prior to merge).

    History should be viewable from log --all --decorate --oneline --graph; not buried in squash commits.









  • Big enough for what though? Big enough to take advantage of the amount of destruction these weapons create? They could have chosen a single isolated, near coast warship. Or even just dropped it near coast on no target at all. The important thing would have been the show of force, in order to deter further attack. Knowing the US had that capability might have been enough to end the war. But we didn’t try to communicate that we had these weapons, instead we used them.