Linux
Custom git merge driver
MERGE CONFLICTS IN git are a normal part of collaboration. But, sometimes you end up in situations of solving the same trivial conflict again and again. That was my situation at $WORK on a busy GitHub Actions pipeline project. The problem GitHub recommends pinning actions to full commit SHAs for Read more…