What this does
If two computers change the same payroll record before they have synced, SeroPayroll does not choose for you. It holds the conflict until you decide.
What you see
- A Conflict badge on the record. It covers employees, pay runs, time-off requests and policies, payees, court orders, contractors and the company profile.
- The badge says: "Changed on two computers since they last synced. Choose which version to keep."
- This computer keeps its own version and does not send it.
- A pay run that uses the record cannot be approved. The screen says "{count} records on this pay run were changed on two computers. Choose which version to keep before approving."
Steps
- Go to Settings › Cloud sync and choose Review conflicts.
- Read Mine (this computer) and Theirs (other computer) side by side. The fields that differ are highlighted. Each side shows who changed it, where and when.
- Choose Keep mine or Keep theirs for a record. Or choose Keep all mine or Keep all theirs.
- The message says "Done. The version you kept will sync to every computer."
What each choice does
- Keep mine writes this computer's version above both revisions, so it wins everywhere.
- Keep theirs takes the other version as it is.
Good to know
- Only an admin can resolve conflicts.
- Two edits pushed at the same moment count as a conflict too.
- Drafts are the only records settled silently. The last writer wins.
- If there are no conflicts, the page says "No conflicts."
- Fix conflicts before approving a pay run that uses the record.