Added a comment

This commit is contained in:
http://joeyh.name/ 2013-06-15 18:50:45 +00:00 committed by admin
parent 1c437de019
commit e9636ac89d

View file

@ -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.
"""]]