diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-03-03 18:12:11 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-03-03 18:12:11 +0000 |
| commit | 19e2a21edb6de119d6394c9bde595384c14407e7 (patch) | |
| tree | eff7cf21db36cdaf19199d0def2aed49f02271a9 /doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | |
| parent | 8d6edac6f48a4bf1522b68a30db579193c097e7a (diff) | |
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. |