prevent staging directory containing files with inline merge conflicts

1 files changed, 6 insertions, 2 deletions

diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 26c3eee49..f1fbc4325 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -225,8 +225,6 @@ func (gui *Gui) handleFilePress() error {
 		return nil
 	}
 
-	// need to stage or unstage depending on situation. If we have a merge conflict we can't do anything
-
 	if node.IsLeaf() {
 		file := node.File
 
@@ -244,6 +242,12 @@ func (gui *Gui) handleFilePress() error {
 			}
 		}
 	} else {
+		// if any files within have inline merge conflicts we can't stage or unstage,
+		// or it'll end up with those >>>>>> lines actually staged
+		if node.GetHasInlineMergeConflicts() {
+			return gui.createErrorPanel(gui.Tr.ErrStageDirWithInlineMergeConflicts)
+		}
+
 		if node.GetHasUnstagedChanges() {
 			if err := gui.GitCommand.StageFile(node.Path); err != nil {
 				return gui.surfaceError(err)