Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit 02a9d2f

Browse files
authored
C115949: Adding two spaces to create hard break-line after snippet
Localization team has reported source content issue that causes localized version to have broken/different format compared to en-us version. Description: After doing online verification I could see that the content is still shown in one row. Kindly consider adding two spaces after the snippet.
1 parent 98e80db commit 02a9d2f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

docs/relational-databases/replication/merge/advanced-merge-replication-conflict-detection-and-resolution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ms.author: "mathoma"
5858
After a conflict is detected, the Merge Agent launches the selected conflict resolver and uses the resolver to determine the conflict winner. The winning row is applied at the Publisher and Subscriber, and the data from the losing row is written to a conflict table. Conflicts are resolved immediately after the resolver executes, unless you select to resolve conflicts interactively.
5959

6060
Resolve Merge Replication Conflicts
61-
[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
61+
[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../../../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
6262
When a Publisher and a Subscriber are connected and synchronization occurs, the Merge Agent detects if there are any conflicts. If conflicts are detected, the Merge Agent uses a conflict resolver to determine which data will be accepted and propagated to other sites.
6363

6464
> [!NOTE]

0 commit comments

Comments
 (0)