While you are working on a project, other members of your team may be committing changes to the project repository. To get these changes, you have to update your working copy.
To update your working copy from SVN repository
Right-click (macOS: Ctrl + click) the model item (the item of the uppermost level) in the Projects tree and choose SVN > Update from the popup menu, or
Select any element of the model and choose File > SVN > Update from the main menu.
- If everything is OK, you will just see a progress dialog shown shortly. This means that the operation was successful.
- Otherwise, if there are some conflicts (see the detailed information below), you will see the dialog that prompts you to resolve the conflict either by using the incoming or local copy of the resource:
There are three different kinds of incoming changes:
A non-conflicting change occurs when a file has been changed remotely but has not been modified locally.
An auto-mergeable conflicting change occurs when an ASCII file has been changed both remotely and locally (i.e. has non-committed local changes) but the changes are on different lines.
A conflicting change occurs when one or more of the same lines of an ASCII file have been changed both remotely and locally. Binary files are never auto-mergeable and are conflicting by default.
When you perform an update, the contents of your working copy will be updated with the latest version of the resource available in the repository. For non-conflicting and auto-mergeable conflicts, there is no additional action required. The repository contents are not changed when you update When you accept incoming changes, these changes are applied to your working copy only. The repository is only changed when you commit your outgoing changes.
How can we improve this article?