People, conflicts and what sync tells you
When two people change the same line, nokko keeps both versions and shows a conflict copy under the original until you pick one. Everything else merges by itself. People are labels in Markdown files, not accounts.
For Mac, iPhone · Last checked
People and the team
On the Mac
- Choose Workspace ▸ People & Team….
- Type a name under New person's name and click Add. This creates
People/Name.md. - Select the person to add a surname, email, phone, role, GitHub login, colour or photo.
- Tick the people on this workspace's team. Those are the names the Assignee menus offer.
- Select yourself and click This is me on this Mac.

People are labels. There is no password and no sign-in, and someone can be assigned work without ever opening nokko. The team list is stored in _workspace.md under team:, and it syncs with everything else.
This is me on this Mac stays on this Mac. It signs the time you log and offers you first in Assignee menus. If a person's GitHub field matches the account a Mac signed in with, that Mac picks the name by itself.
Assign a task
On the Mac, open the task panel and use Assignee. Pick a name, None, or New Person… to make one on the spot. Assign to me appears when the task has nobody and this Mac knows who you are.
This adds one field to the task's line in the file:
- [ ] Send the logo files [Assignee:: Eglė]The iPhone shows assignees but does not set them. Add or change them on a Mac, or edit the line in any text editor.
How a conflict appears
Two people can change one file at the same time without a conflict. nokko merges them line by line, and the footer says merged 1 file. A task is one line, so this covers almost everything.
If the very same line changed two ways, nokko keeps both. The version already shared stays under the original name, with the other changes merged in. The device that synced second puts its own version beside it as a conflict copy:
Retainer.md
Retainer (conflict from Studio iMac, 10 Oct 08.42 43aa77).mdThe name gives the device, the date and time, and six characters that keep two copies in one minute apart. The copy syncs to every device.
On the Mac it appears in the sidebar under the original as Conflict · 10 Oct 08:42, and the footer counts it. On iPhone, Settings gains a Conflict Copies row under Sync. A copy never counts in Today, All Tasks or a client's totals.
Resolve a conflict on the Mac
Click the copy to read it. It opens read-only. Then click … on the row, or right-click it and choose Resolve…, or click the count in the footer.
| Choice | What happens |
|---|---|
| Keep Mine | The copy's text replaces the original, and the copy goes to the Trash. |
| Keep Theirs | The original stays as it is, and the copy goes to the Trash. |
| Open Both | Opens the original, then the copy, so you can read them. Nothing changes. |
To keep parts of both, use Open Both, edit the original by hand, then choose Keep Theirs to clear the copy. If the original has gone, Keep Theirs is not offered, and Keep Mine puts the copy back under the original name.
If nokko says the file could not be replaced, it changed again while you were choosing. Wait for the next sync, read both versions and try again.
Resolve a conflict on iPhone
Open Settings and tap Conflict Copies. Each copy says which device made it and when.
- Compare shows the original above the copy, as plain text.
- Keep This Copy replaces the original with the copy.
- Keep the Original removes the copy.
The Activity feed
On the Mac
A workspace on GitHub has a clock button in the sidebar footer, labelled Activity. It lists what synced, newest first and grouped by day. A row reads like Eglė updated Retainer.md, and clicking it opens the file.
The name comes from People & Team when someone's GitHub field matches. Otherwise you see their GitHub login. A commit made outside nokko shows its own first line.
A board also shows a small marker such as Eglė · 40 sec ago when someone else changed it in the last hour. That is the last change that synced, not someone editing now.
The feed reads the repository's commits. A server and iCloud keep no such record, so those workspaces have no Activity button.
Restore a file from a snapshot
On the Mac
nokko copies the workspace's Markdown once a day and keeps the last 14 copies on this Mac. They are for the mistake you notice later, and they work with or without sync.
- Choose File ▸ Restore a File from a Snapshot….
- Open a dated folder, such as
2026-11-03 08.15. - Find the file and click Restore.
The file goes back to its own path, and the version it replaces moves to the Trash. On a synced workspace the restored file then syncs like any other change.
Snapshots cover .md files only, not images or PDFs. If nokko says there are no snapshots yet, the workspace has only just opened. The first one follows a moment later.
What the notice log says after a sync
On the Mac
The bell in the toolbar keeps a list called Notifications. When a sync brings in someone else's work, it adds up to five lines, and each one opens its task or board:
- A teammate completed “Send the logo files” in Retainer
- A teammate: 5 tasks completed in Retainer
- A teammate added 2 tasks in Retainer

Files do not record who ticked a box, so the line says A teammate. On a team of exactly two, with This is me on this Mac set, it uses the other person's name.
The bell always shows these. To stop them also reaching macOS, turn off Teammate activity in Settings ▸ Notifications. If you work alone, a line can describe your own work from your other device.
Sync status on iPhone
On iPhone
Open Settings and look under Sync. There is a status row, Sync Now, and a note with more detail. The iPhone syncs when nokko opens, after each change, and every 20 to 60 seconds while it is on screen, depending on the sync option.
| The row says | What it means |
|---|---|
| Ready | Connected, and the first pass has not run yet. |
| Syncing… | Files are moving. |
| Up to date | Everything matched at the last pass. |
| Offline | Changes wait on this iPhone and go up when it is back online. |
| Needs attention | The note below says what is wrong. |
| Sign in again | The account behind this workspace is no longer signed in, or a server's key changed. |
| Waiting on the Mac | A large delete has paused. Nothing was deleted. Open the workspace on a Mac to confirm it. |
Questions
- Does nokko ever overwrite someone's work during a conflict?
- No. nokko keeps every line of yours, either in the merged file or in the conflict copy. Nothing is lost until you choose. When you resolve a conflict on the Mac, the removed copy goes to the Trash. A wrong choice can still be undone from there, or with a daily snapshot.
- Do my nokko teammates need accounts for People?
- No. A person in nokko is a Markdown file in the People folder, with no password and no sign-in. You can assign tasks to someone who never opens the app. Sync accounts are separate: GitHub workspaces need a GitHub sign-in on each device, and a server needs access for each device.