Settings window reference
From the Unity Editor, configure the settings of Unity Version Control.
読み終わるまでの所要時間 3 分最終更新 4日前
To open the Settings window, select the cog icon in the Unity Version Control (UVCS) window and select Settings from the dropdown menu. There are three sections in the Settings window, with the options described in the tables below.
Pending Changes Options
Field | Description |
|---|---|
| Automatically add new files to source control | Let UVCS add new files to source control automatically. |
| Auto-refresh | Automatically refreshes the Pending Changes list as needed to avoid manual refreshing. |
| What to find | |
| Show checkouts | Shows files that: You have explicitly checked out in UVCS. You have moved. Have a merge in progress. |
| Find changed files in the workspace | Checks the workspace directory structure to identify changed files via the timestamp. |
| Check the content to determine files as changed, not just timestamp | Calculates the hash of files with updated timestamps to ensure the file content has actually changed. |
| What to show | |
| Group changes in “change lists” | |
| Show private files | Shows files that are not committed to source control, such as new files or tool-generated content. |
| Show ignored files | Shows files that you’ve added to the ignored list. |
| Show hidden files | Shows files that you’ve added to the hidden list. |
| Show deleted files and directories | Shows files that you’ve deleted manually in the workspace outside of UVCS. |
| Move detection | |
| Find moved and renamed files and directories | Searches the workspace for possible renamed or moved files, for example, if one file has been deleted and another file has been added. |
| Match binary files only when they have the same extension | Restricts file matching for binary files to files with the same extension. |
| Match text files only when they have the same extension | Restricts file matching for text files to files with the same extension. |
| Similarity percentage slider | Defines how similar files need to be considered as moved or renamed. For text files, this percentage relates to the content. For binary files, this percentage relates to the file size. For directory structures, this relates to children as a percentage of the total number of directory entries. |
Diff and Merge Options
Field | Description |
|---|---|
| Comparison method and encoding | |
| Comparison method | Lets you ignore EOL and/or whitespace differences when diffing files |
| Default encoding | Default encoding for the source contributor when diffing two files |
| Result encoding | Default encoding for the destination contributor when diffing two files |
| Merge conflict resolution | |
| Manual conflict resolution | When two files are in conflict during a merge, always ask the user to manually solve it |
| Automatic conflict resolution | When two files are in conflict, try to solve it automatically, and don't ask the user if it's not necessary |
| Merge view behavior | |
| Close merge view and open pending changes when a merge is completed | Automatically closes the merge tab and switches to the pending changes after the merge is finished |
| Allow merge with pending changes | When this option is disabled, trying to perform a merge with pending changes shows an error |
Shelve and Switch Options
Behavior for pending changes after shelving
Field | Description |
|---|---|
| Undo changes | Deletes all shelved changes from the pending changes after the shelve. |
| Keep changes | Keeps changes in pending changes after the shelve. |
| Ask always | Prompts UVCS to ask which option to use every time you shelve changes. |
Behavior when trying to switch/update the workspace with changed items
Field | Description |
|---|---|
| Shelve | This is the default behavior. UVCS asks whether to leave your changes on a shelf so you can apply them later, or bring the changes with you to the destination of the switch. |
| Allow | Try to perform the switch without modifying your pending changes. If there are conflicts between your pending changes and the destination of the update, the file doesn't update. |
| Allow, showing a warning | Same behavior as Allow, but a dialog is shown to warn you about the pending changes. |
| Do not allow, show an error | UVCS shows an error when you try to switch or update with changed items that forces you to undo the changes manually to continue. |