News for hackers. Stuff that matters.

A comment on I struggled with Git, so I'm making a game to spare others the pain. Parent comment

Re:I struggled with Git, so I'm making a game to spare other... by friendzis on Monday March 03, 2025 @02:17AM (#43239123)
But solving merge conflicts is fundamentally an editing task, not source control.
[ Parent | on HN ]
Re:I struggled with Git, so I'm making a game to spare other... by ninetyninenine on Monday March 03, 2025 @03:01AM (#43239366)
Yeah this is true. It’s similar enough such that most gui version control interfaces include an interface to deal with this.
[ Parent | on HN ]
Re:I struggled with Git, so I'm making a game to spare other... by aragilar on Monday March 03, 2025 @04:58AM (#43240166)
Your editor should be able to handle this (via git mergetool).
[ Parent | on HN ]
Re:I struggled with Git, so I'm making a game to spare other... by BobaFloutist on Monday March 03, 2025 @11:08AM (#43243129)
Word processors are for editing documents, saving documents in different locations and formats should be handled by your file system of choice.
[ Parent | on HN ]