The file should no longer be in your working copy of the repository. This file status is available if the Highlight files from non-active changelists option is enabled in Settings | Version Control | Changelists. The file in an inactive changelist has been modified. The file has changed since the last synchronization. Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. The file is merged by your VCS as a result of an update.ĭuring the last update, the file has been merged with conflicts.ĭuring the last update, the IDE has detected differences between the properties of the local file and its server version. The file is modified without checkout.Ī file is intentionally untracked by VCS. This status is available if the Highlight directories that contain modified files in the Project tree option is enabled in Settings | Version Control | Confirmation. If a file is modified, the IDE will highlight its parent directory. If a file is modified, the IDE will recursively highlight all directories containing that file. The file has been deleted locally, but hasn't been scheduled for deletion, and it still exists in the repository. The file is scheduled for deletion from the repository. ![]() If a file is a copy of another file, its metadata is tracked, and such a file is marked as copied. This file status is available if all options are enabled in Settings | Version Control | Changelists. In this case, a new dialog will open prompting you to resolve the changelist conflict. ![]() The file in an inactive changelist has been modified in the active changelist. ![]() The file in an inactive changelist is scheduled for addition to the repository. The file in the active changelist is scheduled for addition to the repository.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |