4
The following types of conflict can be encountered during a merge, or
5
a merge-like operation (such as resyncing local changes with
10
* Parent directory missing when attempting to add a file
12
* Attempt to create directory that already exists
14
* Some patch hunks failed to apply
16
* While changing permissions, the "old" permissions in the changeset do
19
* While replacing contents of a file, the old contents of a file do not
22
* Attempt to remove non-empty directory: This only occurs when the
23
directory has contents that it didn't have the last time it was deleted.
24
It's pretty easy to handle adds, renames and deletes for exact
25
patching. There's no need to rm -rf directories as tla does.
27
* Attempt to create a symlink when there is already a file/dir/etc with
30
* Attempt to apply a patch to a file that does not exist
32
* Attempt to remove a file that does not exist
34
* Attempt to rename a file that does not exist
36
* Attempt to change permissions of a file that does not exist
38
* Can't determine filename during three-way merging
40
* Can't determine file parent directory during three-way merging
42
* Can't determine file permissions during three-way merging
44
Aaaron says: I have no doubt there are more. For example, attempt to
45
change permissions of a symlink.
added
removed
doc/conflicts.txt
