From e9636ac89dddbdb3b7f0c9a07b480a8fabc12447 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Sat, 15 Jun 2013 18:50:45 +0000 Subject: [PATCH] Added a comment --- .../comment_1_c2092add1430667108a3fdc5e1c9b5f5._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_1_c2092add1430667108a3fdc5e1c9b5f5._comment diff --git a/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_1_c2092add1430667108a3fdc5e1c9b5f5._comment b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_1_c2092add1430667108a3fdc5e1c9b5f5._comment new file mode 100644 index 0000000000..52bb21ae31 --- /dev/null +++ b/doc/bugs/windows_port_-_repo_can__39__t_pull_newly_added_files_/comment_1_c2092add1430667108a3fdc5e1c9b5f5._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + nickname="joey" + subject="comment 1" + date="2013-06-15T18:50:45Z" + content=""" +Joe, you need to carefully read [[direct_mode]]. When you manually run `git merge` in a direct mode repository, you defeat associated file tracking, with the resulting behavior you describe. This is why there is a [[todo/direct_mode_guard]] todo item. +"""]]