はてなブックマーク - How git-mediate made me stop fearing merge conflicts and start treating them like an easy game of…
https://b.hatena.ne.jp/entry/s/medium.com/@yairchu/how-git-mediate-made-me-stop-fearing-merge-conflicts-and-start-treating-them-like-an-easy-game-of-a2c71b919984
If you’ve ever had to deal with git merge conflicts, then there’s a good chance that these messages give you the chills: Auto-merging <SOURCE-FILE-PATH> CONFLICT (content): Merge conflict in <SOURC...nabinno
https://b.hatena.ne.jp/nabinno/20170118#bookmark-316405138
2017-01-18T07:07:57ZmediumHiro_Matsuno
https://b.hatena.ne.jp/Hiro_Matsuno/20170117#bookmark-316405138
2017-01-17T12:59:19Ztuki0918
https://b.hatena.ne.jp/tuki0918/20170117#bookmark-316405138
2017-01-17T10:02:14Zfreakyyy_com
https://b.hatena.ne.jp/freakyyy_com/20170117#bookmark-316405138
2017-01-17T05:13:24Zあとで読むu_wot_m8
https://b.hatena.ne.jp/u_wot_m8/20170117#bookmark-316405138
2017-01-17T04:53:50ZHaskellgit