diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-03 14:57:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-03 14:57:32 -0400 |
| commit | 0d74c7eb607f8d5c6770f486cc008aa28ee71622 (patch) | |
| tree | c61c8debb1ac3b2c27302c9e5814b8630236f59f /doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | |
| parent | a9067868a8594577ead2ecbe55f9563bef12f26d (diff) | |
| parent | 19e2a21edb6de119d6394c9bde595384c14407e7 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn')
| -rw-r--r-- | doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | 3 |
1 files changed, 3 insertions, 0 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 new file mode 100644 index 000000000..ebc832f6b --- /dev/null +++ b/doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn @@ -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. |