Data conflicts
A data conflict means an official register has changed data that your team has edited in Strise. Your edit stays in place, but Strise can no longer tell whether it is still right, so someone on your team has to decide: keep the edit, or use what the register now says.
Conflicts are raised for two kinds of data:
| Data | Example |
|---|---|
| Shareholders | You changed an owner's share, and the register has since updated that owner |
| Roles | You edited a board member, and the register has since removed that role |
Other company information you edit, such as addresses or industry codes, does not raise conflicts.
Why conflicts happen
An edit in Strise is based on what the register said at the time. When the register later changes the same owner or role, the two disagree. The conflict card says which of these happened:
| What the register did | What you see |
|---|---|
| Updated it | Register said (the value your edit was based on) and Register now says |
| Removed it | Removed from register |
| Added a new record | Register now says, with the new record |
If you removed an owner or role and the register later removes it too, there is nothing to decide: Strise drops your edit and raises no conflict.
A role edit can also conflict indirectly: the register changed the same person in another role, or changed a role only one person holds at a time (chief executive, chair or deputy chair). The card then says Indirectly conflicts with an earlier user edit.
Where to find them
- Notifications. A new conflict is announced in the bell menu at the top right and by email.
- The company page. The company header, the ownership chart, roles and reviews show a Conflicting edits to review banner. Open it to see every open conflict on the company.
- The Edited badge. An edited owner or role with an open conflict is marked, and you can resolve the conflict from the badge.
- The activity log. The registry change that caused the conflict shows it inline. See Entity activity log.
How to resolve a conflict
In the conflicts window opened from the banner, every conflict on the same edit shares one card, and one choice resolves them all. From the Edited badge or the activity log, each conflict is resolved on its own.
- Open the conflicts from the banner, a notification, the Edited badge or the activity log.
- Read the card. It shows what the register said, what it says now, and your edit.
- Choose one of the two actions.
The action names depend on the change:
| Situation | Keep your edit | Use the register |
|---|---|---|
| The register updated the owner or role | Keep my edit | Use register value |
| The register removed it | Keep my edit | Accept removal |
| You had removed it | Keep removed | Restore owner or Restore role |
| You had replaced one owner with another | Keep the owner you added | Remove it, or Restore the original |
| The register changed a related role | Keep my edit | Discard my edit |
Both choices appear in the activity log under your name. Using the register's value undoes your edit, and the undo shows the conflict it resolved.
For shareholder conflicts, the ownership chart sits beside the list. Each card has a number that also appears on its Edited badge in the chart, and Show in chart moves the chart to that owner. Switch between With your edits and Register to compare the two versions. The chart here is for viewing only; edit owners from the company's Ownership tab.
Conflicts that resolve themselves
Some actions settle a conflict without anyone choosing:
- Undoing or resetting the edit resolves the conflict in favour of the register.
- Editing the same owner or role again resolves it in favour of your new edit, since you have made a fresh decision about that value.
Who can resolve conflicts
Resolving a shareholder conflict needs permission to edit owners, and resolving a role conflict needs permission to edit roles. Team members without it can see conflicts but not resolve them.
Last updated on