Turns out that git now allows you to have multiple branches checked out at once! https://github.com/blog/2042-git-2-5-including-multiple-worktrees-and-triangular-workflows I have needed this for ages.