-
@nicknisi The squash merge mental load is from knowing if a local branch fully merged or not… that’s why I wouldn’t make it the default too.
-
@nicknisi But hey, I also prefer IntelliJ over vim, emacs, and even VS Code… so all of my git opinions definitely says more about me than anything else 😂 😆
-
Much like how immutable functional code should be encouraged by default, I just feel git should by default not allow forced branches or squash merge…. Keep the options for those super advanced cases sure, but 98% of the time safety is better than clean history!