Merde.ai: AI-fixed merge conflicts Posted by mettler on Thursday January 30, 2025 @05:10PM from the merde.ai dept. https://merde.ai/ ( 4 comments | 2 points | on HN )
And some tech details: https://sketch.dev/blog/jagged-git-repo
(not mine, I just think it's cool)