News for hackers. Stuff that matters.
Re:Mergiraf: a syntax-aware merge driver for Git by CGamesPlay on Saturday November 09, 2024 @07:14AM (#42093988)
But surely Mergiraf has some opinion about the order when it doesn’t matter, right? Like structs before impls, in your example.
Re:Mergiraf: a syntax-aware merge driver for Git by wetneb on Saturday November 09, 2024 @07:32AM (#42094071)
For now, you let it reorder every child within a given node type, which felt expressive enough to me in most cases, but I agree it would be good to refine that: https://codeberg.org/mergiraf/mergiraf/issues/6
Re:Mergiraf: a syntax-aware merge driver for Git by zeotroph on Saturday November 09, 2024 @02:48PM (#42096455)
Looking at the nice demo, I think just defaulting to asking for confirmation if there is ambiguity, instead of dazzling the user with `mergiraf solve` magic would help; there is already a `merigraf review`. Then, a confirm prompt, an option to undo the resolution completely, or just do it on a file-by-file basis (with help what command to run next).