Merge tab reference
From the Unity Editor, explore the merge operations in your repository and solve the conflicts.
読み終わるまでの所要時間 2 分最終更新 3日前
The Merge tab of the Unity Version Control (UVCS) window displays the changes involved in a merge operation with the potential conflicts to solve. You can use this tab to apply the merge in your workspace and solve the conflicts. You can start a merge operation with either a branch or a changeset:
- Select a branch from the Branches tab and select Merge from this branch.
- Select a changeset from the Changesets tab and select Merge from this changeset.
Element | Description |
|---|---|
| Apply changes button | When there are no conflicts to solve, you can directly apply the changes to your workspace. |
| Resolve conflicts button | If there are any conflicts, this button shows instead of Apply changes. This option starts the conflict resolution and resolves one conflict at a time. |
| Path | The file path and name. |
| Size | The size of the file. |
| Author | The user who checked in the change. |
| Details | The description of what the update operation does with the related change. |
| Resolution method | The resolution method the user selects when they solve the directory conflicts. |
| Date modified | The date of the file’s most recent check in. |
| Comments | The comment added by the user who checked in the change. |
Context menu options
Menu item | Description |
|---|---|
| Merge selected files | When selecting one or more conflicts, it starts the merge resolution just for the selected conflicts. |
| Merge keeping source changes (theirs) | When selecting one or more conflicts, solves the conflict by keeping the changes in the source of the merge. |
| Merge keeping workspace changes (yours/destination) | When selecting one or more conflicts, solves the conflict by keeping the changes in the destination of the merge. |
| Diff source with destination | When selecting a file that has changed in source and destination, opens a diff with between the contributors. |
| Diff ancestor with destination contributor | When selecting a file that has changed in destination, opens a diff of the destination contributor changes. |
| Diff ancestor with source contributor | When selecting a file that has changed in source, opens a diff of the source contributor changes. |
| Copy path | Copies the full (absolute) path of the selected file(s) to the clipboard. |
| Copy relative path | Copies the path (relative to the workspace) of the selected file(s) to the clipboard. |
| History | Opens the History tab for the selected file. |