nilbus.com personal blog
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!
- Points
- 191
- HN comments
- 64
- Submissions
- 1
- Cited by
- 0 commenters
Tools & ProductivitySoftware Engineering2022
On Hacker News
| Submitted | Title on HN | Points | Comments |
|---|---|---|---|
| Apr 18, 2022 | Take the pain out of Git conflict resolution: use diff3 (2017) by harporoeder | 191 | 64 |
