diff --git a/doc/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/comment_4_49bdbdc261c8e5b72f84c52014f892df._comment b/doc/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/comment_4_49bdbdc261c8e5b72f84c52014f892df._comment
new file mode 100644
index 0000000000..991ad48a88
--- /dev/null
+++ b/doc/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/comment_4_49bdbdc261c8e5b72f84c52014f892df._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2016-06-14T01:55:03Z"
+ content="""
+Forgot to mention that the repeated merge commits happened because git
+merge -no-ff was being used, which makes a merge commit even when it can
+just fast-forward. That was removed as part of the fix, so the repeated
+merges should also be resolved.
+"""]]