Update Revisions of Project Files

Update Revisions with SVN

In a project, to get the latest revisions of all project files from the source control repository, click Update in the source control section of the project tab.

Use Update to get other people’s changes from the repository and find out about any conflicts. If you want to back out local changes, use Revert Project instead. See Discard Local Changes.

After you update, the project displays a dialog box listing all the files that have changed on disk. You can control this behavior using the project preference Show changes on source control update.

When your project uses SVN source control, Update calls svn update to bring changes from the repository into your working copy. If there are other people’s changes in your modified files, SVN adds conflict markers to the file. SVN preserves your modifications.

Caution

Ensure you have registered SLX files as binary with SVN before using Update. If you do not, SVN conflict markers can corrupt your SLX file. The project warns you about this when you first click Update to ensure you protect your model files. See Register Model Files with Subversion.

You must resolve any conflicts before you can commit. See Resolve Conflicts.

Update Revisions with Git

If you are using Git™ source control, click Pull in the source control pane.

Caution

Ensure you have registered SLX files as binary with Git before using Pull. If you do not, conflict markers can corrupt your SLX file. See Set Up Git Source Control.

Pull fetches the latest changes and merges them into your current branch. If you are not sure what is going to come in from the repository, use fetch to examine the changes first and then merge the changes manually.

Pull might fail if you have conflicts. With a complicated change you might want to create a branch from the origin, make some compatibility changes, then merge that branch into the main tracking branch. For next steps, see Pull, Push, and Fetch Files with Git.

Update Selected Files

To update selected files, right-click and select the Update command for the source control system you are using. For example, if you are using SVN, select Source Control > Update from SVN to get fresh local copies of the selected files from the repository.