From cd3671c6405460b77701f8b7f222369c5016c797 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2020 23:11:45 +0000 Subject: [PATCH 1/2] Bump node-diff3 from 1.0.0 to 2.0.1 Bumps [node-diff3](https://github.com/bhousel/node-diff3) from 1.0.0 to 2.0.1. - [Release notes](https://github.com/bhousel/node-diff3/releases) - [Changelog](https://github.com/bhousel/node-diff3/blob/master/CHANGELOG.md) - [Commits](https://github.com/bhousel/node-diff3/compare/v1.0.0...v2.0.1) Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6bf756e86..f8f895d13 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "lodash-es": "~4.17.15", "marked": "0.8.0", "martinez-polygon-clipping": "0.6.2", - "node-diff3": "1.0.0", + "node-diff3": "2.0.1", "osm-auth": "1.0.2", "pannellum": "2.5.6", "rbush": "3.0.1", From fcc21ce856129f6323f775d4829fd503a9c990f0 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 4 Jun 2020 19:16:49 -0400 Subject: [PATCH 2/2] Update node-diff3 API calls for v2.0.0 --- modules/actions/merge_remote_changes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/actions/merge_remote_changes.js b/modules/actions/merge_remote_changes.js index 07b76facb..ee4d1d143 100644 --- a/modules/actions/merge_remote_changes.js +++ b/modules/actions/merge_remote_changes.js @@ -49,7 +49,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag var a = target.nodes || []; var b = remote.nodes || []; var nodes = []; - var hunks = diff3Merge(a, o, b, true); + var hunks = diff3Merge(a, o, b, { excludeFalseConflicts: true }); for (var i = 0; i < hunks.length; i++) { var hunk = hunks[i];