Resolving file conflicts
Conflicts occur when another team member makes changes to an asset that you have also changed, and you try to update your project with those changes. Collaborate automatically attempts to merge files and informs you if the attempt fails due to a conflict. For text files, Collaborate merges files using the currently configured merge tool. For scenes and other files using the YAML format, Collaborate uses Unity’s Smart Merge tool to perform the merge.
You can reduce the occurrence of conflicts by publishing small changes often, and communicating with your teammates. The In-Progress feature can help you reduce conflicts on scenes and prefabs. For more information, see In-Progress edit notifications.
Configure your merge tool
You can set your external merge tool in the preference settings of the Unity Editor:
- On the Editor menu bar, select Edit > Preferences.
- Click External Tools.
- In the Revision Control Diff/Merge drop-down menu, select an external merge tool.
The following merge tools work well with Collaborate:
- Apple File Merge
- WinMerge
- Beyond Compare 4
- SourceGear DiffMerge
- TkDiff
You might experience issues using other external merge tools.
Working with conflicts
After merging files, if there are any assets with conflicts, Unity displays a red warning icon on the collaborate button in the Editor toolbar. To view a list of assets with conflicts, click the collaborate button.
When you hover over an asset in the list, the conflicts dialog shows four actions for each asset with a conflict. You can:
- View diff; use the default merge tool to view the differences between the files
- Use merge tool; open an external merge tool to compare the differences
- Use my changes; publish your changes, overwriting the currently saved version of the asset
- Use remote changes; delete your changes and use the version of the asset from the cloud
The image below illustrates the icons that are available on conflicted items:
To view a conflict, hover over the conflicted file and click the eye icon.
Note: You cannot view changes to image files such as .pngs.
You can use an external merge tool to resolve conflicts on text-based files. To resolve the conflict using an external merge tool, click the merge icon.
To replace the version of the asset in the cloud with your version of the asset, click the up arrow icon.
To discard your version of the asset and apply the version in the cloud to your local project, click the down arrow icon.
• 2017–05–16 Page amended with no editorial review