Size: 638
Comment: lowercase links, rewording
|
Size: 685
Comment: +added, moved, removed or renamed files
|
Deletions are marked like this. | Additions are marked like this. |
Line 3: | Line 3: |
The '''local modifications''' in a [:WorkingDirectory:working directory] are the differences existing between the files in the working directory compared to their [:Parent:parent] file [:Revision:revisions] in the [:Repository:repository]. | The '''local modifications''' in a [:WorkingDirectory:working directory] are the differences existing between the files in the working directory compared to their [:Parent:parent] file [:Revision:revisions] in the [:Repository:repository] and all added, moved, removed or renamed files. |
Local Modifications
The local modifications in a [:WorkingDirectory:working directory] are the differences existing between the files in the working directory compared to their [:Parent:parent] file [:Revision:revisions] in the [:Repository:repository] and all added, moved, removed or renamed files.
Those differences can be displayed by a [:Diff:diff].
[:Commit:Committing] these local modifications produces a new [:ChangeSet:changeset] in the repository.
If the working directory has two [:Parent:parent] revisions (due to a [:Merge:merge]), the local modifications will correspond to the resolution of the [:Conflict:conflicts].