Ah, I wrote an article on resolving diff3 conflicts by hand: http://h2.jaguarpaw... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

tome on Jan 28, 2023 | parent | context | favorite | on: Merging with diff3: the “three-way merge”

Ah, I wrote an article on resolving diff3 conflicts by hand: http://h2.jaguarpaw.co.uk/posts/git-rebase-conflicts/

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact