News for hackers. Stuff that matters.
Re:Mergiraf: a syntax-aware merge driver for Git by andybak on Saturday November 09, 2024 @07:07AM (#42093971)
Could some of this be mitigated by running a prettifier post-merge?
Re:Mergiraf: a syntax-aware merge driver for Git by wetneb on Saturday November 09, 2024 @07:35AM (#42094083)
It's definitely something I would recommend in general, but I'm not sure if it would solve this particular problem (reordering blocks is perhaps a bit bold for a prettifier).
Re:Mergiraf: a syntax-aware merge driver for Git by andybak on Saturday November 09, 2024 @06:07PM (#42097487)
Maybe prettifier was the wrong word. I've definitely used code formatting tools that offer sorting of certain syntax elements as a feature. (Python imports in PyCharm springs to mind)