Update

Overview

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.

Process

There are three different kinds of incoming changes:

Non-conflicting

A non-conflicting change occurs when a file has been changed remotely but has not been modified locally.

Conflicting, but auto-mergeable

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.

Conflicting

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.

In case a conflict is found, you may choose to revert your changes or edit and resolve the conflict using the Eclipse conflict editor.