diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-03 15:00:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-03 15:00:54 -0400 |
| commit | 035ce6c209b6b9c669025f1d17b0c000c51fa0b5 (patch) | |
| tree | 19a29c274d68eea41a26580d19492c039a271396 | |
| parent | 0d74c7eb607f8d5c6770f486cc008aa28ee71622 (diff) | |
fixed initial reported problem but not out of the woods yet in some related cases
| -rw-r--r-- | doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn b/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn index ebc832f6b..4b5a9d2a3 100644 --- a/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn +++ b/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn @@ -1,3 +1,12 @@ Direct mode merge handles the case where there's a conflict between local and remote files, that are checked into git. -However, the the local file is not checked into git, the merge will overwrite it with the remote file from git. +However, the the local file (or directory, or symlink, whatever) +is not checked into git, the merge will overwrite it with the remote file from git. + +> That's fixed; now this is detected and the local variant +> is renamed with ".variant-local", and possibly a number to make it +> unique. + +New problem: If the merge pulls in a directory, and a file exists with +the name of the directory, locally, not annexed, the file is left alone, +but the directory is thus not checked out, and will be deleted on commit. |