File conflicts occur when you publish a change to something that another teammate has changed in a different way. You can lower the number of conflicts you encounter by committing small changes often, and communicating with your teammates.
The red warning icon appears in the Collab toolbar when you have conflicts. Click the Collab toolbar to open a list of all files with conflicts.
To resolve a conflict, hover over the conflicted file. There are four icons to choose from:
Click the eye icon to view the changes. You are able to view changes of prefabs, scripts, and all binary files; however you cannot view changes to image files like .pngs.
Click the double-up arrow to open up your external merge tool if you want to use that to resolve your conflict (this will only work for prefabs, scripts, and other binary files). You can set your external merge tool by going to Unity > Preferences > External Tools > Revision Control Diff/Merge and selecting a tool there.
Click the single up arrow to submit your file and replace the version that was previously submitted.
Click the down arrow to submit the version of the file that is not yours. This erases your changes to that file and replaces them with the version that was previously submitted.
Is something described here not working as you expect it to? It might be a Known Issue. Please check with the Issue Tracker at issuetracker.unity3d.com.
When you visit any website, it may store or retrieve information on your browser, mostly in the form of cookies. This information might be about you, your preferences or your device and is mostly used to make the site work as you expect it to. The information does not usually directly identify you, but it can give you a more personalized web experience. Because we respect your right to privacy, you can choose not to allow some types of cookies. Click on the different category headings to find out more and change our default settings. However, blocking some types of cookies may impact your experience of the site and the services we are able to offer.
More information
These cookies enable the website to provide enhanced functionality and personalisation. They may be set by us or by third party providers whose services we have added to our pages. If you do not allow these cookies then some or all of these services may not function properly.
These cookies allow us to count visits and traffic sources so we can measure and improve the performance of our site. They help us to know which pages are the most and least popular and see how visitors move around the site. All information these cookies collect is aggregated and therefore anonymous. If you do not allow these cookies we will not know when you have visited our site, and will not be able to monitor its performance.
These cookies may be set through our site by our advertising partners. They may be used by those companies to build a profile of your interests and show you relevant adverts on other sites. They do not store directly personal information, but are based on uniquely identifying your browser and internet device. If you do not allow these cookies, you will experience less targeted advertising. Some 3rd party video providers do not allow video views without targeting cookies. If you are experiencing difficulty viewing a video, you will need to set your cookie preferences for targeting to yes if you wish to view videos from these providers. Unity does not control this.
These cookies are necessary for the website to function and cannot be switched off in our systems. They are usually only set in response to actions made by you which amount to a request for services, such as setting your privacy preferences, logging in or filling in forms. You can set your browser to block or alert you about these cookies, but some parts of the site will not then work. These cookies do not store any personally identifiable information.