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

help-circle


  • What OS are you on? Virtual desktops on Mac and windows are just terrible. On Linux I’ve been using virtual desktops on Linux since the 90s and when I see my colleagues on Mac using a single desktop with 20 windows trying desperately to switch between windows I just shake my head.

    I use dynamic virtual desktops and have a separate desktop for every task. That keeps me focused on that task, but also lets me easily jump to something different. I couldn’t imagine trying to be productive any other way.


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