![]() ![]() With immutability comes the issue of having to copy content from source diffs when creating the merged diff instead of simply referencing. dlang) only logical immutability is used and this works just fine. Since c++ doesn’t have built in support for immutability (like e.g. This was fixed by making the diff structure immutable. Unfortunately, as stated above, the source diffs are rendered invalid when doing a merge and, as such, cannot be reused. Merging cannot be shared since that is where the outcome differs for the three. Much of the setup done by the first can be reused by the next two: Reading and parsing the files, creating mine/base and incoming/base diff. The first glaring issue is that three merges are being done from scratch in the situation where a conflict is present. ![]()
0 Comments
Leave a Reply. |