Weave: Merging based on language structure and not lines

Weave: Merging based on language structure and not lines(ataraxy-labs.github.io)

24 points by rohanat 4 hours ago | 10 comments

adamddev1 15 minutes ago |

I think this is a great idea, and I've wondered about something like this before.

I do find it sad though that the opening description has to be:

> Two agents edit different functions in the same file? Clean merge.

Why does EVERYTHING has to be geared towards agents? Humans can use this too. Why not just "two commits contain edits for different functions in the same file?"

znpy 3 minutes ago | |

> Why does EVERYTHING has to be geared towards agents?

Moving forward one can expect the most amount of code to be generated by agents, so it makes sense to optimise for that use case.

(Note that i’m not saying it’s good or bad)

dash2 47 minutes ago |

If it is worth trying out, it is worth writing the README for.

willrshansen 2 hours ago |

First image I see should be a difference of how the merges work.

psYchotic 1 hour ago |

Without having looked into how Weave works, it sounds similar to Mergiraf: https://mergiraf.org/

rapnie 1 hour ago | |

There's a benchmark on the site that compares with mergiraf.

https://ataraxy-labs.github.io/weave/benchmarks.html

BrandiATMuhkuh 1 hour ago |

Pretty cool. I always thought merges should happen by comparing the AST and not lines

satvikpendem 1 hour ago |

How does it compare to SemanticDiff extension?

csomar 54 minutes ago |

I'm working on an online diff tool (https://codeinput.com/products/merge-conflicts) and recently added a mergiraf integration. Basically, the tool loads your git merge but uses mergiraf as the resolution driver. Then add these auto-resolved files to the editor instead of auto-resolving directly.

I also tried out weave, but apart from TypeScript, I haven't found any cases where it actually outperforms mergiraf (I run a bot that watches for new merge conflicts on GitHub, so I've got a steady stream of conflicts to test against).

I reached out a couple months ago on Reddit, but I don't think we ever landed on a time to talk. Would be interested to re-connect again.

basurayshreyan 4 hours ago |

how does it fare on organisation repos ? Its quite tricky to make it work on org plans where git based merge goes through a lot of code scannings and stuffs i guess. Curious to know about that

rohanat 4 hours ago | |

Good question. Weave is a standard git merge driver, so it slots into the existing flow rather than replacing it. You wire it up in .gitattributes, and it only changes the 3-way conflict-resolution step that git already runs. The output is a normal merged tree, so everything an org layers on top still runs unchanged: branch protection, required status checks, code scanning, CI. It isn't bypassing any of that. It just resolves conflicts by entity structure (functions, classes, methods) instead of line hunks, then hands a regular file back to git.