Resolving conflicts |
Top Previous Next |
If a phrase, autocorrect or glossary has changed, PhraseExpander will offer the option to compare the changes and decide which version to keep (the local, remote or both) Check phrase changes when the phrase has changed remotely If a glossary has changed remotely, PhraseExpander will offer the option to display the changes. PhraseExpander displays the Remote changes pending glossary status. 1.Click on the Check remote changes. 2.Check the changes that you want to import inside your local copy and click on Merge
Check phrase changes when the phrase has changed both remotely and locally If a glossary has changed remotely but also contains local changes, PhraseExpander displays the In conflict glossary status. 1.Click on the Check remote changes. 2.If an item has been modified both locally or remotely, PhraseExpander will display that, automatically choosing the most recent copy. You can click on Resolve to choose the copy that you want to keep 3.Check the changes that you want to import inside your local copy and click on Merge
Publishing the new version of the glossary Once you have resolved the conflict, publish the updated glossary by clicking on the Send changes button.
|