Keep both people's work

Free Files and calendars · One-time purchase Tidigar Business · Paid

You update the workshop agenda while a colleague renames the invitation activity. When the changes meet, Tidigar can usually keep both. If you both rename the same activity differently, it asks which title to keep.

Try independent edits on a shared plan

This workshop has three activities and one following milestone. Open in Tidigar opens your own copy. The frame shows the plan; it does not simulate another person's edits or open the conflict sheet.

For a two-person exercise, move your copy to a writable Business organisation and invite a colleague as an editor. Both people must open that organisation's same plan. Sending each person a copy creates separate plans that do not exchange changes. See Business teams and Sharing a plan.

1. Both open A workshop planned together while connected. Your colleague can then go offline with that plan already open.
2. Change the progress of Draft the agenda from 25 to 50 percent and let your connected device save it.
3. While still offline, your colleague renames Invite customers to Invite workshop guests.
4. Reconnect the colleague's device and let it sync. Check that the shared plan now has both the new progress and the new title.

Neither edit needs to win over the other. They change different fields. The same applies when one person changes an activity's title and another changes its progress, provided the combined plan remains valid.

Choose a title when both people changed it

Start connected again so both people see Invite workshop guests. Take the colleague's device offline, rename that activity to Invite pilot customers on your connected device, and let it save. On the offline device, rename it to Invite workshop participants. Reconnect that device.

When its changes meet yours, Choose what to keep shows the conflicting title. On that device, Mine is Invite workshop participants; Theirs is Invite pilot customers. These labels describe the two versions being compared, rather than who owns the plan.

Choose the title to keep, then save the merge. Every conflict needs a choice before saving is available. Changes that do not conflict are already included. Check the result in the shared plan after sync completes.

All mine and All theirs answer the conflicts together. They still retain independent changes from both versions; they do not replace the whole plan with one person's snapshot. Use individual choices when you need some changes from each person.

When dates need another choice

Suppose you extend Draft the agenda while someone else moves Invite customers earlier. Each person's plan can be valid by itself, yet their combined dates may put the invitation before its predecessor has finished.

The sheet can then show The combination would not be valid. Where rescheduling can fix a dependency timing conflict, Keep both, move later offers dates that retain the changes and move waiting work. Later activities can follow too. Review every resulting row before saving.

That option is offered only where moving later helps. It cannot fix every invalid combination, such as an activity ending before it starts or a dependency cycle. Choose differently for the changes involved. Tidigar checks the combined plan rather than silently accepting dates or relationships that cannot work together.

How merging works in detail

A shared starting point explains what changed

Tidigar compares your current plan and the incoming version with a previously known shared version. A field changed on only one side is kept. The same value chosen on both sides needs no decision. Different changes to the same field require a choice.

Records are matched by their identity, so two activities with the same title can still be different activities. A title or a matching project identifier alone does not prove that two copies share a known starting point. New plans and conflict copies are independent plans.

The shared starting point is remembered locally for synchronization; it is not a history carried in a share link or exported plan. Missing or unreadable local history can therefore prevent a merge even when two versions look related. Keeping a copy or explicitly choosing a replacement is safer than guessing which edits were intended.

Deletion and ordering can conflict too

Deleting a record on one side and leaving it unchanged on the other removes it. Deleting it while the other side edits it needs a choice: restoring the edited record and accepting its deletion express different intentions.

Conflicts can also involve dimensions, dimension values, milestones, periods and saved views. Incompatible ordering changes can need a decision. Dependencies are combined as relationships, then checked with the rest of the plan. Independent edits may still produce a broken reference, a cycle or impossible dates; resolving the text choices can reveal another conflict about that combination.

Your personal reading state, such as which view is selected or which summaries are folded, is separate from the plan. It is not another person's conflicting edit. Stored view settings do belong to the plan; see Timeline views.

More changes can arrive while you choose

For browser tabs and Business updates, the sheet can refresh if the stored plan changes again. It says The roadmap changed again. Check the choices before saving. Review the displayed values, including any new conflicts. Saving checks for another update before applying the merge; the first save attempt may refresh the choices instead of closing the sheet.

In the apps, updates received during an iCloud conflict-version decision can wait until that decision finishes. A resolved sheet does not mean every device has already received the result. Wait for saving and synchronization to complete before checking another device.

Cancelling depends on where the changes came from

Cancelling the sheet leaves the fallback for that storage workflow in place:

A conflict copy has its own identity. Review both plans and keep the one you intend to continue, transferring any remaining useful edits deliberately. Editing a copy does not resolve or update the original automatically. Read the message and storage label before assuming the copy is shared with colleagues.

File and calendar providers have limits

Reading files and calendars is free. Writing them requires the Files and calendars one-time purchase in the Apple apps; Files and calendars explains how to open and share their storage. A known shared version can let Tidigar combine file changes, including iCloud conflict versions. Without it, the app can preserve a conflict copy. Another tab's local browser storage, Business synchronization and a provider's file versions are different ways for changes to arrive; none makes independently sent copies into one live plan.

Calendars have no remembered shared version across editor sessions. The calendar provider settles each event's versions before Tidigar reads them, so Tidigar cannot recover an event version that the provider has already discarded. A partial calendar reload may wait for another notification rather than immediately treating missing records as deletions. Provider permissions and valid calendar content still govern whether the plan can be written.

These safeguards reduce accidental overwrites; they are not a backup history of every edit. For choosing a storage place and keeping an independent plan, continue with Library and storage.