Archives: November 2014

Merge two versions of a file with git-checkout

I have slightly different i3 configuration files between my desktop and laptop computers. In this case, the laptop keyboard is missing a Play/Pause multimedia key. This is where the two files differ: the laptop has a different key binding for running the music player. Having recently added new…