• 0 Posts
  • 18 Comments
Joined 2 years ago
cake
Cake day: June 11th, 2023

help-circle
  • If ‘—first-parent’ was the default way that git log worked, I don’t think we’d even be having this argument over how to merge branches.

    In my opinion, the best strategy is to always use a merge commit, and then when viewing master, always use —first-parent which will ONLY show commits on master. This gives you:

    • a very clean, linear history
    • the ability to let people work in their branches in their own way (it is ok to merge master into your branch multiple times without rebasing)
    • you can dig into the history of any branch if needed
    • it makes it easy to backport changes as you can cherry-pick out the merge commit which contains everything.

    The problem is just the default log view of git and tools.


















  • Whew! It’s a good thing trucks never go through cross walks or across curb cuts to get into parking lots and drive throughs.

    The only reason people ride scooters on the sidewalks is because our infrastructure is severely lacking and you get stuck “sharing” a lane with a 6000+lb truck.