If it is worth trying out, it is worth writing the README for.
Weave: Merging based on language structure and not lines
11–20 of 51 posts
Re: Weave: Merging based on language structure and not lines
#12I 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?"
Re: Weave: Merging based on language structure and not lines
#13I 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?"
> 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)
Re: Weave: Merging based on language structure and not lines
#14This tool does not work. I wanted it to work. I wanted to automate merges with AI supervision. No dice. Silent corruption that wouldn't go away no matter how many issues I filed. Unacceptable. Had to disable it. https://github.com/Ataraxy-Labs/weave/issues?q=is%3Aissue%20... Be warned.
Re: Weave: Merging based on language structure and not lines
#15I 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?"
Totally fair. The merge logic doesn't care whether a human or an agent wrote the commit, "two commits touch different functions in the same file, clean merge" is exactly how a human should read it too. We lead with agents because that's where merge volume is about to explode and the pain is worst, not because it's agent-only. Point taken on the copy, I'll make it less exclusionary.
Re: Weave: Merging based on language structure and not lines
#16First image I see should be a difference of how the merges work.
Thanks a lot for this feedback, you are right, but I actually had a page about the merge algorithm more in depth, maybe you will love it.
Re: Weave: Merging based on language structure and not lines
#17If it is worth trying out, it is worth writing the README for.
Yeah you can find the readme on the github repository.
Re: Weave: Merging based on language structure and not lines
#18Pretty cool. I always thought merges should happen by comparing the AST and not lines
Thanks a lot for the feedback, appreicate it!
Re: Weave: Merging based on language structure and not lines
#19I 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?"
> 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)
> so it makes sense to optimise for that use case.
How do the agent and human use cases meaningfully differ here, though?
I'm pretty sure GP's complaint is about the prose description, rather than the actual functionality.
Re: Weave: Merging based on language structure and not lines
#20This tool does not work. I wanted it to work. I wanted to automate merges with AI supervision. No dice. Silent corruption that wouldn't go away no matter how many issues I filed. Unacceptable. Had to disable it. https://github.com/Ataraxy-Labs/weave/issues?q=is%3Aissue%20... Be warned.
I am sorry about your experience igra, but to be fair, yeah there are some failure cases but I love to receive any feedback that you think can improve it and make it a more generalized solution.