ponyfoo.com

  1. Conflict Resolution and Code Reviews

    Have you ever tried to do a code review on a PR that merges a large release branch or feature branch back into mainline, fixing merge conflicts? It’s not pretty.

    3m 3