From 8785dad6b968994d0e71401980140e9bddd67b2c Mon Sep 17 00:00:00 2001
From: "hristo.mitev" <hristo.mitev@rewardgateway.com>
Date: Tue, 8 Sep 2026 13:02:46 +0300
Subject: [PATCH] add conflict checking functionality

---
 src/Api/Repositories/Workspaces/Commits.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Api/Repositories/Workspaces/Commits.php b/src/Api/Repositories/Workspaces/Commits.php
index 1954a49..75a4a95 100644
--- a/src/Api/Repositories/Workspaces/Commits.php
+++ b/src/Api/Repositories/Workspaces/Commits.php
@@ -41,4 +41,14 @@ public function show(string $commit, array $params = []): array
 
         return $this->get($uri, $params);
     }
+
+    /**
+     * @throws \Http\Client\Exception
+     */
+    public function fileConflicts(string $commitSpec, array $params = []): array
+    {
+        $uri = UriBuilder::build('repositories', $this->workspace, $this->repo, 'file-conflicts', $commitSpec);
+
+        return $this->get($uri, $params);
+    }
 }