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

help-circle



  • I doubt it. We plant soy beans as part of crop rotation, but don’t actually consume them. We sold them primarily to china to use as feed for animals since china primarily uses its soy beans to feed its population. Due to the trade war, china is purchasing soy from other countries. This means every other year, farmers will not have income unless either the US consumes a lot more soybeans or all the farmers agree to use a different crop rotation that has value. But soy beans are easy to plant, do a great job enriching soil, and can grow in most climates in the us.















  • 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.