19 ms·
> After extracting a list of every merge conflict in the kernel's Git history, I tried using Mergiraf to resolve them. 6,987 still resulted in conflicts, but 42
by gritzko 11mo ago
> After extracting a list of every merge conflict in the kernel's Git history, I tried using Mergiraf to resolve them. 6,987 still resulted in conflicts, but 428 were resolved successfully. A much larger fraction of merge conflicts were still partially resolved.
- bjackman 11mo agoTake this with a grain of salt as I haven't tested this claim, but I think C might be a pretty weak language for this tool because you can't really parse it without running the whole preprocessor, which it can't do: https://codeberg.org/mergiraf/mergiraf/issues/612#issuecomment-7639939 https://codeberg.org/mergiraf/mergiraf/issues/612#issuecomme... So I think in a more sensible language you might get much better results than this.
- gritzko 11mo agoAnother aspect is the fact this repo reflects Torvalds’ view of the world. He operates in large-ish changesets.