Fixing hellacious merge conflicts left behind and/or built up in some in-flight PRs & feature branches due to layoffs. 1) I& #39;m lucky. 2) Those folks already have or will have multiple offers. 3) Thank goodness for diff3 conflict resolution. It should be the default.

Claim: If diff3 were Git& #39;s default conflict resolution setting, many more developers would understand merge conflicts and less would fear them. @sublimegeek