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

Browse source
This commit is contained in:
http://joeyh.name/ 2014-03-03 18:12:11 +00:00 committed by admin
parent 04b77328ef
commit c8e4c76302
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn Normal file
View file

@ -0,0 +1,3 @@
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.