Change page style: 

Conflicts

Conflicts may arise when you synchronize your program if:

  1. another user has made conflicting changes since you last synchronized with the Gemini Observing Database
  2. the Phase-2 Status has changed since you last synchronized and your change is no longer permitted

If you encounter a conflict you will get this pop-up message which gives you two choices:

1. "Accept All Remote" will forget about any changes that you have just made and accept all the incoming changes from the Gemini Observing Database.

2. "Cancel and Review" will allow you to review the conflicts and retain any changes that you have made.

Conflict Warning
The Conflict panel on the right will describe the conflict and how it can be resolved. In the example to the right you may use the button labeled "Display local version" to switch between the two versions in order to decide which you prefer. Pressing the "Keep displayed version" button will mark this conflict as resolved. Clicking the "Conflict" button in the upper right will take you to the next conflict, if any. When all the conflicts have been resolved you may synchronize with the Gemini Observing Database. Conflict Toggle
In the case where it is possible to toggle between the two different versions the conflicting elements will be marked by red "C" icons, as shown to the right. The Conflict button in the upper right may be used to navigate between the different conflicts. Conflict Sequence

If the local and remote versions of an observation cannot be automatically merged (and the conflict distilled down to a single component as in the example above) then the local copy of the conflicting observation will be put into a "Conflict" folder so that you may keep your changes if you desire. Selecting the Conflict folder will show the message below. If you click this button it will delete all your changes since your last synchronization with the Gemini Observing Database. If you prefer to review each of the conflicts click on the Conflict button at the top right to navigate to the next conflict.

Conflict Folder Message

An example Conflict folder is shown at the right. It contains the local observation which could not be merged with the observation in the Gemini Observing Database. This is done so that the local changes are not accidentally overwritten. If you want to retain your modifications you may drag the observation out of the Conflict folder. Conflict Folder
When you click on an observation in the Conflict folder the panel at the right will describe where the observation came from. In this case the observation is the local copy of Observation 5 in the Gemini Observing Database. Conflict Message
Another example of a conflict which cannot be automatically merged is where one user makes a change to an observation and another user deletes the same observation. The OT will put the deleted observation into the Conflict folder so that you may decide whether to delete it. If you want to save it just drag the observation out of the Conflict folder. Conflict Message: Observation Deleted