Redirecting from
/2016-12-20-git-checkout-ours-theirs/
to
https://naokiotsu.com/blog/2016-12-20-git-checkout-ours-theirs