From 7edcc8358ce553d157ea45cd774f7f5932940b2c Mon Sep 17 00:00:00 2001
From: 0penBrain <48731257+0penBrain@users.noreply.github.com>
Date: Wed, 13 Apr 2022 15:18:55 +0200
Subject: [PATCH] Sheet: Warn user when cell merge is not done because already
 merge cells in the range

 Partially fixes #6744
---
 src/Mod/Spreadsheet/App/PropertySheet.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp
index f570a98fcb..770c38d1cc 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp
@@ -1016,8 +1016,10 @@ bool PropertySheet::mergeCells(CellAddress from, CellAddress to)
     // Check that this merge is not overlapping other merged cells
     for (int r = from.row(); r <= to.row(); ++r) {
         for (int c = from.col(); c <= to.col(); ++c) {
-            if (mergedCells.find(CellAddress(r, c)) != mergedCells.end())
-                return false;
+            if (mergedCells.find(CellAddress(r, c)) != mergedCells.end()) {
+                    Base::Console().Warning("Cells merging is not possible when already merged cells are in the target range.\n");
+                    return false;
+            }
         }
     }