diff --git a/doc/forum/Handling_merge_conflicts_in_direct_mode/comment_1_7046393b0c4329466a0d6803b718f786._comment b/doc/forum/Handling_merge_conflicts_in_direct_mode/comment_1_7046393b0c4329466a0d6803b718f786._comment
new file mode 100644
index 0000000000..b74be782b8
--- /dev/null
+++ b/doc/forum/Handling_merge_conflicts_in_direct_mode/comment_1_7046393b0c4329466a0d6803b718f786._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2019-07-19T17:10:41Z"
+ content="""
+I'd encourage you to stop using direct mode, which is well on its way to
+being deprecated and has never been flexible enough to do this kind of
+thing easily.
+
+If you `git annex upgrade` that repository, you will get a v7 repository
+with an adjusted unlocked branch checked out, which is equivilant to a
+direct mode repository, but lets you use arbitrary git commands for merging
+etc.
+"""]]