Merge pull request #9414 from raghuveer-singh-mendix/commit-message-during-auto-merge

Recorded the behaviour of commit message when conflict are auto resolved

Author: MariaShaposhnikova

content/en/docs/refguide/version-control/using-version-control-in-studio-pro/merge-algorithm.md

@@ -111,6 +111,12 @@ Your work is now labelled *Theirs*, while the server changes are labelled *Mine*
 
 {{< figure src="/attachments/refguide/version-control/using-version-control-in-studio-pro/merge-algorithm/Steps/Rebase_Step_1.png" width="525"  >}} 
 
+When merge conflicts are automatically resolved, Studio Pro adds a **#Conflicts** tag to the commit message. The **#Conflicts** tag in Studio Pro serves as a smart indicator, highlighting files that encountered conflicts during the rebase process. This feature is particularly valuable as it maintains a record of auto-merged conflicts, giving developers clear insight into the merge history.
+Key benefits of this approach are the following:
+* Transparency – It clearly shows which files required conflict resolution.
+* Efficiency – Auto-merging saves time while still flagging areas for review.
+* Traceability – It maintains conflict history to support code reviews and troubleshooting.
+
 #### Resolving the First Conflict{#resolving-first-conflict}
 
 Git tries to apply your first commit (`#3`) to the top of the rebasing branch (*Mine*). The commit will come after commit `#4`.