September 27, 2016
1 min read
And you can avoid merge conflicts by adding entries to your .gitattributes file:
.bash_history merge=union
