Skip to content

Commit d952062

Browse files
Review
1 parent ed4e572 commit d952062

File tree

1 file changed

+5
-5
lines changed
  • content/en/docs/refguide/version-control/using-version-control-in-studio-pro

1 file changed

+5
-5
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ Your work is now labelled *Theirs*, while the server changes are labelled *Mine*
111111

112112
{{< figure src="/attachments/refguide/version-control/using-version-control-in-studio-pro/merge-algorithm/Steps/Rebase_Step_1.png" width="525" >}}
113113

114-
When conflicts arise during merges and 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, providing developers with a clear audit trail of changes.
115-
Key benefits of this approach include:
116-
* Transparency: Developers can easily identify which files required conflict resolution.
117-
* Efficiency: Auto-merging saves time while still flagging potential areas for review.
118-
* Traceability: The preserved conflict information aids in code review and troubleshooting.
114+
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.
115+
Key benefits of this approach are the following:
116+
* Transparency – It clearly shows which files required conflict resolution.
117+
* EfficiencyAuto-merging saves time while still flagging areas for review.
118+
* Traceability – It maintains conflict history to support code reviews and troubleshooting.
119119

120120
#### Resolving the First Conflict{#resolving-first-conflict}
121121

0 commit comments

Comments
 (0)