Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/learning/backend/ConcurrencyControl.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This article assumes that you already know that:
| **Conflict-resolution** | Choosing how to resolve a conflict. |
| **Lock** | The right to access an Element and its descendant Elements. |
| **Merge** | Apply a Changeset to a briefcase. |
| **Optimistic Concurrency Control** | A policy that allows apps to elements without acquiring locks. |
| **Optimistic Concurrency Control** | A policy that allows apps to make changes to elements without acquiring locks. |
| **Pessimistic Concurrency Control** | A policy that requires apps to acquire locks before changing elements. |
| **Push** | Upload a Changeset to iModelHub |
| **Pull** | Download a Changeset from iModelHub. See [IModelDb synchronization](./IModelDbSync.md) |
Expand Down