On the theory of patches I found this set of posts helpful: https://jneem.github.io/merging/

TIL from the first 10 minutes (I didn't have time to watch the whole thing): I've been mis-pronouncing the name of pijul :)