Yeah this is true. It’s similar enough such that most gui version control interf... | Hacker News

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

		ninetyninenine on March 3, 2025 \| parent \| context \| favorite \| on: I struggled with Git, so I'm making a game to spar... Yeah this is true. It’s similar enough such that most gui version control interfaces include an interface to deal with this.

aragilar on March 3, 2025 [–]

Your editor should be able to handle this (via git mergetool).

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