Refresh Your Source Files
To avoid code conflicts in the first place, it's important to keep your source files up-to-date with everybody's changes. Simply refresh your workspace, when notified, to bring in changes that your teammates have published.
Note:
For optimal performance, this functionality takes effect only in workspaces with fewer than 1000 files.