Weave: Merging based on language structure and not lines

psYchotic 23 minutes ago | parent | next [-]

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

	▲	rapnie 14 minutes ago \| parent [-]
		There's a benchmark on the site that compares with mergiraf. https://ataraxy-labs.github.io/weave/benchmarks.html

▲

willrshansen an hour ago | parent | prev | next [-]

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

▲

satvikpendem 35 minutes ago | parent | prev | next [-]

How does it compare to SemanticDiff extension?

▲

basurayshreyan 3 hours ago | parent | prev [-]

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 3 hours ago \| parent [-]
		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.