Tobias

@haodang You mean something like: https://developpaper.com/principle-of-git-merge-recursive-three-way-merge-algorithm/. Could you look into #32? This should provide the needed functionality. Could you test that?

Aha. Understood. You mean fuzzy patches. I think there is an open PR. At the moment that applying does need exact line numbers, as you mentioned. With fuzzy patches only...

Not at the moment. But I think it should not be hard to implement. Since all Deltas are derived from AbstractDelta, I guess you should be able to replace the...

There was a change to somehow decompress the computed deltas that have different target and source sizes. That was needed to correct some issues with multi line diffs. But I...

Could you check it? I added the possibility to skip the delta decompression. After it is switched off you get your old result.s

Sorry, about the late answer: What about `.ignoreWhiteSpaces(true)`?

Introduced your test but could not reproduce your behaviour. Since there is no context specified, my test successfully can apply this patch to the left text and it results in:...

JSqlParser enforces some coding rules you are violating in your PR. A complete maven build does not succeed in your branch. Please correct that. ``` Error: src/main/java/net/sf/jsqlparser/statement/select/Join.java:[311,9] (whitespace) WhitespaceAfter: 'if'...

To my knowledge *partition by* is only used in window functions or like Oracle calls it: analytic funtions. Your useage is not supported. If I am wrong, point us to...

Please describe the error. English should be used here. Don't use a screenshot. We do not want to copy the SQLs and stuff.