Caleb's Website

Font size

Main

  • Home
  • Thoughts
  • Minecraft

Tech

  • Projects
  • Tech writing

External

  • Website source code

Tech stuff

Page last updated 17 June 2026

If you fancy reading some articles I’ve written in the VCS space, have a go at some of the following:

  • Playing with merging sets together
  • Describing the uncherrypick identity problem
  • Asking the question whether the “badmerge” scenario should conflict.
  • Making the case that three way merges don’t care about linebreaks.