kwhkim

7 ms·

1. 1.▲
   by kwhkim 7mo ago

   As for the merge conflict, you resolve it the same way you would with any other file in git. I think a custom merge driver needs to be developed eventually — for example, automatically picking `type: bug or feature` instead of leaving the r
2. 2.▲
   by kwhkim 7mo ago

   Thank you for the seasoned opinion. * It will produce a merge by default, but you can use `git pad merge --rebase` to rebase when possible. I thought a lot about this — "Do I need linear commits whenever possible?" I understand li
3. 3.▲
   by kwhkim 7mo ago

   I’d like to share my work with you: https://news.ycombinator.com/item?id=47137452 It shows that I posted just a little later than you. I agree that the chances of something going wrong with timestamps are low, but I still t
4. 4.▲
   by kwhkim 7mo ago

   Impressive work. I built something similar and clearly remember the design choices I made, so this is an interesting subject. On CRDTs: I assume tools like git-bug adopted CRDTs primarily to avoid merge conflicts, but "last-writer-wins
5. 5.▲
   Show HN: Git-pad: Git-native issue tracker(github.com)

   3 points by kwhkim 7mo ago|2 comments