title: Keeping two Git branches different by one file
body: <p>I am certain two branches of my Git repo should only ever be different in a single file. The simplest way to ensure this is to do all work in <code>branch1</code>, and merge it into <code>branch2</code> whenever I switch to it (wrapped into a shell script, so I only need one command per switch). However, is there a way to do this with even less work?</p>