Differences between revisions 3 and 4
⇤ ← Revision 3 as of 2007-02-06 20:42:17 →
Size: 529
Editor: ThomasArendsenHein
Comment:
← Revision 4 as of 2008-01-04 15:26:15 → ⇥
Size: 553
Editor: abuehl
Comment: +cat
Deletions are marked like this. Additions are marked like this.
Line 14: Line 14:
----
CategoryGlossary

Local Modifications

The local modifications in a WorkingDirectory are the differences existing between the files content on the filesystem and the files content in the ["Repository"] at the ["Parent"] revision.

Those differences can be displayed by a ["Diff"].

If those local modifications are committed, they will become a new ChangeSet.

When the working directory has two ["Parent"] revisions as the result of a ["Merge"], the local modifications will correspond to the resolution of the ["Conflict"]s.

CategoryGlossary

LocalModifications (last edited 2012-11-06 16:09:22 by abuehl)