bruno/remotely-save
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slightly optimize two way merge

Browse Source
This commit is contained in:
fyears 2024-07-13 23:19:39 +08:00
parent 7228398d0a
commit f256936bae
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pro/src/conflictLogic.ts
View File

@ -73,6 +73,18 @@ function getLCSText(a: string, b: string) {
* @returns * @returns
*/ */
function twoWayMerge(a: string, b: string): string { function twoWayMerge(a: string, b: string): string {
const aa = a.trim();
const bb = b.trim();
if (aa === "" && bb === "") {
return aa.length >= bb.length ? a : b;
}
if (bb === "") {
return a;
}
if (aa === "") {
return b;
}
// const c = getLCSText(a, b); // const c = getLCSText(a, b);
// const patches = makePatches(c, a); // const patches = makePatches(c, a);
// const [d] = applyPatches(patches, b); // const [d] = applyPatches(patches, b);