From fa3c98428384cf073d13848ffa5c0a25d2f3393f Mon Sep 17 00:00:00 2001
From: agrasth <agrasthn@jfrog.com>
Date: Tue, 27 Jan 2026 15:26:56 +0530
Subject: [PATCH 1/2] Fix the merge artifact issue

---
 go.mod | 4 ++--
 go.sum | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index e42be5e90..fd1f9adb2 100644
--- a/go.mod
+++ b/go.mod
@@ -286,8 +286,8 @@ replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1
 
 // replace github.com/jfrog/jfrog-cli-artifactory => github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20260105073552-ae4f86048a11
 //
-//replace github.com/jfrog/build-info-go => github.com/fluxxBot/build-info-go v1.10.10-0.20260105070825-d3f36f619ba5
-//
+replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba
+
 //replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.58.1-0.20260105065921-c6488910f44c
 
 //replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.54.2-0.20251007084958-5eeaa42c31a6
diff --git a/go.sum b/go.sum
index d3b15d43c..1429fd179 100644
--- a/go.sum
+++ b/go.sum
@@ -1204,8 +1204,8 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP
 github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=
 github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
 github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
-github.com/jfrog/build-info-go v1.13.1-0.20260120103048-d7f367bfa36e h1:STiWjuLtlEFR1H3kSKw6vDGhGdtUmV6O+ljPfrQ14sI=
-github.com/jfrog/build-info-go v1.13.1-0.20260120103048-d7f367bfa36e/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
+github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba h1:lqQ11uedpLeEbAOmDqZkaBrQG06jB5fr7US22uiLitw=
+github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
 github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ=
 github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
 github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=

From c8c3460b7ed227082fc338be909ea74bb921f67b Mon Sep 17 00:00:00 2001
From: agrasth <agrasthn@jfrog.com>
Date: Wed, 28 Jan 2026 16:14:28 +0530
Subject: [PATCH 2/2] Updated the merge logic and added more tests

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index fd1f9adb2..dff969583 100644
--- a/go.mod
+++ b/go.mod
@@ -286,7 +286,7 @@ replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1
 
 // replace github.com/jfrog/jfrog-cli-artifactory => github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20260105073552-ae4f86048a11
 //
-replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba
+replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.13.1-0.20260128091639-7ac525e2092c
 
 //replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.58.1-0.20260105065921-c6488910f44c
 
diff --git a/go.sum b/go.sum
index 1429fd179..b09f8ad6a 100644
--- a/go.sum
+++ b/go.sum
@@ -1204,8 +1204,8 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP
 github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=
 github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
 github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
-github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba h1:lqQ11uedpLeEbAOmDqZkaBrQG06jB5fr7US22uiLitw=
-github.com/jfrog/build-info-go v1.13.1-0.20260127093223-22b6bbbee3ba/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
+github.com/jfrog/build-info-go v1.13.1-0.20260128091639-7ac525e2092c h1:Qe6LVZecpY/sdx+F67+6Xs2mZxTkyUijcJitmz4gQeo=
+github.com/jfrog/build-info-go v1.13.1-0.20260128091639-7ac525e2092c/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
 github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ=
 github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
 github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=