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.

This article explains the challenges I went through and how I ended up implementing a two-way synchronization between the web application and a git repository for the articles.

These are short-form “thoughts”, in addition to the usual longer-form articles in the blog. The goal is to publish one of these every weekday. I’d …