I've been using a git repo for managing my systems configs for a while now. I used the documentation on Digital Ocean tutorials here. Pretty much I have a remote repo on a server. Do a git clone of the repo. Then symbolic link the dot files and directories to the home directory. If I change a config file I just do a git push to the remote repo.
The issue I'm running into is that I need different version of some configs. For example, the .i3blocks config is different depending if I'm using my home workstation, my laptop, or my work machine. I'm not very familiar with git so I'm not sure how to deal with this. Any suggestions?