From 19e2a21edb6de119d6394c9bde595384c14407e7 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Mon, 3 Mar 2014 18:12:11 +0000 Subject: --- .../direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn (limited to 'doc/bugs/direct_mode_merge_can_overwrite_local__44___non-annexed_files.mdwn') 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. -- cgit v1.2.3