Version: 2020.1
Reverting files
콜라보레이트에 퍼블리시하지 않도록 에셋 제외

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.

작은 변경 사항을 자주 퍼블리시하고 팀원들과 소통함으로써 충돌 발생을 줄일 수 있습니다. In-Progress 기능을 사용하면 씬과 프리팹에서의 충돌을 줄일 수 있습니다. 자세한 내용은 In-Progress 편집 알림을 참조하십시오.

병합 툴 설정

Unity 에디터의 환경 설정에서 외부 병합 툴을 설정할 수 있습니다.

  1. On the Editor menu bar, select Edit > Preferences.
  2. Click External Tools.
  3. In the Revision Control Diff/Merge drop-down menu, select an external merge tool.

다음의 병합 툴은 Collaborate와 호환됩니다.

  • Apple File Merge
  • WinMerge
  • Beyond Compare 4
  • SourceGear DiffMerge
  • TkDiff

다른 외부 병합 툴을 사용하면 문제가 발생할 수 있습니다.

충돌 해결

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:

File conflicts in Collaborate
File conflicts in Collaborate

충돌을 확인하려면 충돌이 발생한 파일에 마우스를 가져다 대고 눈 모양 아이콘을 클릭하십시오.

눈 모양 아이콘
눈 모양 아이콘

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.

Merge icon
Merge icon

To replace the version of the asset in the cloud with your version of the asset, click the up arrow icon.

Up arrow icon
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.

Down arrow icon
Down arrow icon

• 2017–05–16 편집 리뷰 없이 페이지가 수정됨

Reverting files
콜라보레이트에 퍼블리시하지 않도록 에셋 제외