aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ian <Ian@web>2011-12-20 22:36:03 +0000
committerGravatar admin <admin@branchable.com>2011-12-20 22:36:03 +0000
commit58a89c243cd7beeaff8fb8b45bf20d934d6882ed (patch)
tree596183b3ee1a253354485d95c9307038dcbf2050
parentcc88abd0ad84c0a196edbc7a67cec493f6f532b9 (diff)
-rw-r--r--doc/forum/A_really_stupid_question.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/forum/A_really_stupid_question.mdwn b/doc/forum/A_really_stupid_question.mdwn
new file mode 100644
index 000000000..38c7bcb56
--- /dev/null
+++ b/doc/forum/A_really_stupid_question.mdwn
@@ -0,0 +1,3 @@
+Sorry, but all this wiki and the manpage seem to gloss over the most obvious question:
+
+What happens when you commit conflicting edits in different repositories?