mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed initial reported problem but not out of the woods yet in some related cases

Browse source
This commit is contained in:
Joey Hess 2014-03-03 15:00:54 -04:00
parent 36ab2cd0e0
commit eef1b7a3cc
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn
View file

@ -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.