From ba59248903ec296bb29bb3cc03ea6b32e45efb96 Mon Sep 17 00:00:00 2001
From: Dominic Couture <dcouture@gitlab.com>
Date: Tue, 24 Dec 2024 10:29:27 +0000
Subject: [PATCH] Fix Vulnerability - Use of a broken or risky cryptographic
 algorithm [ci skip]

---
 internal/git/conflict/resolve.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal/git/conflict/resolve.go b/internal/git/conflict/resolve.go
index 1b970220e9..f61aef5480 100644
--- a/internal/git/conflict/resolve.go
+++ b/internal/git/conflict/resolve.go
@@ -3,7 +3,7 @@ package conflict
 import (
 	"bufio"
 	"bytes"
-	"crypto/sha1"
+	"crypto/sha256"
 	"errors"
 	"fmt"
 	"io"
@@ -252,3 +252,4 @@ func Resolve(src io.Reader, ours, theirs git.ObjectID, path string, resolution R
 
 	return &resolvedContent, nil
 }
+
-- 
GitLab