Felicitas Pojtinger 🌅
It's neat how 90% of merge conflicts can be solved more or less automatically now
Feb 21 at 1:35amWeb
Show threadFelicitas Pojtinger 🌅Feb 21
Semi-automated maintenance of forks is more or less possible now which opens so many possibilities, both good and bad
Show threadJubeiFeb 21
@pojntfx could you elaborate as to why now? Did something change?
Show threadFelicitas Pojtinger 🌅Feb 21
@jubei LLMs, mostly! They are incredibly good at "semantic merging"
Show threadJubeiFeb 21
@pojntfx but git for example does not have an LLM back-end. Or do tools like github or gitlab now support some kind of LLM backend for merges?
Show threadFelicitas Pojtinger 🌅Feb 21
@jubei They don't, nope, but with a simple flow - merge, then as any LLM CLI with tool access to fix merge conflicts - it works really flawlessly!
Show threadJubeiFeb 21
@pojntfx perhaps you can write a blog post at some point on how exactly you do that for your setup. 🫡
Show threadSiilwynFeb 22
@pojntfx I've been enjoying Mergiraf as a git merge driver. Not 90% but I'd say 30% of my merge conflicts are solved for me.
https://mergiraf.org/
Introduction - Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.