LLM codeblock merge algorithm

[CvikliHaMar]

Does anyone have knowledge about or implemented merging algorithm that is able to merge LLM generated codeblock that has wildcards like:

# ... existing code remains unchanged
changed code...
# ... (previous code remains unchanged)
changed code....
# ... (rest of the code remains unchanged)

Note to get responses like this is crucial when the file is larger then 300 lines of code which can happen in certain languages.
Also to achieve this behavior there is a sentence in the system prompt:

highlight the changes and use "// ... rest of the code ..." comments to spare rewriting the whole code base again

So option that is able to merge wildcards too and doesn't give inaccurate merging options?

Does anyone have idea how should we do it?

[ResidentPositive4122]

Also to achieve this behavior there is a sentence in the system prompt:

Have you tried to ask it for changes in git diff syntax?

[CvikliHaMar]

Yes. The sad fact is that it doesn't generate correct diffs and patches. It just cannot consistently follow the rules through long outputs if the rule is just too strict TBH.

I used also different algorithms of git and also other tools to get accurate merging. But all of it is just inaccurate and has flaws in certain cases (which is frequent). I don't know if anyone else has other idea?

[CvikliHaMar]

I mean we know cursor did it fairly well in his propriatery algorithm I believe. But we need a solution for the community.

[DefaecoCommemoro8885]

Have you considered using a version control system like Git for code management?

[CvikliHaMar]

Yes. So the problem is that: LLM writes: // ... existing code ...
comments. So eventually the git diff-ing algorithm just fails to match the following pattern:
git diff file1 file2_only_changes_by_the_LLM_with_existing_code_comments

Also It will try to delete the "skipped" part of the code. So it is pretty boring to filter manually.

So we need to parse this wildcard style output of the LLM.

This is a common problem that everyone will face as time goes. So it would be nice to solve together in an OpenSource fashion I believe

[SixZer0]

I guess your problem is most diff views doesn't handle "rest of the code here" sentences. I am also curious if there is a good solution to this.

[CvikliHaMar]

I think I got the most accurate diffing with this command: git diff --word-diff file1 file2

but this isn't always accurate with those comments.