Merge pull request #561 from vtex/add/resolve-all-to-conflicts-resolver

Add resolveAll to the ConflicstResolver module
vtex · Oct 23, 2024 · 9924145 · 9924145
2 parents 4a5bff1 + 1c052c4
commit 9924145
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+- resolveAll to `MineWinsConflictsResolver` to handle an array of conflicts.
+
 ## [6.47.0] - 2024-06-11
 ### Added
 - Add option to save asynchronous cache

diff --git a/src/utils/MineWinsConflictsResolver.ts b/src/utils/MineWinsConflictsResolver.ts
@@ -48,6 +48,20 @@ export class MineWinsConflictsResolver<T> implements ConflictsResolver<T> {
     })
   }
 
+  public async resolveAll() {
+    const conflictsResponse = await this.client.getConflicts<AxiosResponse<VBaseConflictData[]>>(this.bucket)
+    const { data: conflicts }: { data: VBaseConflictData[] } = conflictsResponse
+
+    const resolvedConflicts = conflicts.map((conflict) => {
+      conflict.base.parsedContent = this.parseConflict(conflict.base)
+      conflict.master.parsedContent = this.parseConflict(conflict.master)
+      conflict.mine.parsedContent = this.parseConflict(conflict.mine)
+      return this.resolveConflictMineWins(conflict)
+    })
+
+    return resolvedConflicts
+  }
+
   protected mergeMineWins(base: Configuration, master: Configuration, mine: Configuration) {
     if (isArray(master)) {
       return this.mergeMineWinsArray((base || []) as ConfigurationData[], master, (mine || []) as ConfigurationData[])