1
Take the pain out of Git conflict resolution: use diff3 (2017)
Hating git conflicts? Use git's built-in diff3 option to make sense out of it all!
nilbus.com
Rubyist and git lover
- Popular posts
- 1
- Total points
- 191
- HN comments
- 64
- Rank
- #13,213 personal
Visit blog.nilbus.com → RSS feedOn Hacker News Apr 2022 – Apr 2022