From 38bb8769b2d9213f5f1efe4c412bcba0a3774e3f Mon Sep 17 00:00:00 2001
From: Corentin Damman <c.damman@intopix.com>
Date: Tue, 9 Jun 2026 18:58:42 +0200
Subject: [PATCH] fix: remove extra '\n' when resolving conflicts using
 internal merge tool

---
 src/ViewModels/MergeConflictEditor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ViewModels/MergeConflictEditor.cs b/src/ViewModels/MergeConflictEditor.cs
index 5c739ae23..fc9d0f632 100644
--- a/src/ViewModels/MergeConflictEditor.cs
+++ b/src/ViewModels/MergeConflictEditor.cs
@@ -190,6 +190,9 @@ public async Task<bool> SaveAndStageAsync()
             for (var j = lastLineIdx; j < lines.Length; j++)
                 builder.Append(lines[j]).Append('\n');
 
+            if (builder.Length > 1)
+                builder.Length--; // Remove extra '\n'
+
             try
             {
                 // Write merged content to file