Complications of collaborative work

The complications may be as follows:

1 You are working on some version of a file, and at this moment somebody (for example your colleague) submits another version of the same file.

It is important to detect this situation as early as possible because if you don’t know that somebody else has submitted a newer version and continue to work on your version, then your work may be useless: sometime later, you will need to choose either your version of the file or your colleague’s version, so it’s better to start considering this as early as possible.

Timeline would detect such situation and, whenever a submission of a new version is made, Timeline will display the following dialog:

You have 2 options:

• You can ignore the newly submitted version and continue working with your current version.
  In this case, when you submit your next version it will be added after the newly submitted one.
• You can revert your changes and get the newly submitted version.
  Please note that in this case you lose the changes you have made.
  If you choose this option, Timeline will warn you about the potential loss of your changes.

2 You worked on a version of a file on one computer. Then you started working on the same file on another computer, and from the second computer you submitted your work as a version. Then you return to your first computer.

This situation needs to be detected to remind you that you have a newer version of the file on the server. Timeline would automatically detect such situation and display the following message:

You have 2 options:

• You can ignore the newly submitted version and continue working with your current version.
  In this case, when you submit your next version it will be added after the newly submitted one.
  
• You can get the newly submitted version.