Skip to main content
 

My new favorite way to manage home directories with git

And you can avoid merge conflicts by adding entries to your .gitattributes file:

.bash_history merge=union

Link