Update GenerateCommitMessageService.cs

guibranco · Dec 12, 2024 · 647afd4 · 647afd4
1 parent 64833be
commit 647afd4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Src/AiCommitMessage/Services/GenerateCommitMessageService.cs b/Src/AiCommitMessage/Services/GenerateCommitMessageService.cs
@@ -13,6 +13,10 @@ namespace AiCommitMessage.Services;
 /// </summary>
 public class GenerateCommitMessageService
 {
+    private static readonly Regex MergeConflictPattern = new Regex(@"^Merge branch '.*' into .*$", RegexOptions.Compiled);
+
+    private static bool IsMergeConflictResolution(string message) => MergeConflictPattern.IsMatch(message);
+
     /// <summary>
     /// Generates a commit message based on the provided options and the OpenAI API.
     /// </summary>