News for hackers. Stuff that matters.
Re:Mergiraf: a syntax-aware merge driver for Git by IshKebab on Saturday November 09, 2024 @02:15PM (#42096262)
Yes maybe, but these issues are true for Git's native merge algorithms too. It isn't perfect either.

As soon as you do any merge you're accepting that there might be edits you don't agree with.

There are no comments on this comment yet.