From 58a89c243cd7beeaff8fb8b45bf20d934d6882ed Mon Sep 17 00:00:00 2001 From: Ian Date: Tue, 20 Dec 2011 22:36:03 +0000 Subject: [PATCH] --- doc/forum/A_really_stupid_question.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/forum/A_really_stupid_question.mdwn diff --git a/doc/forum/A_really_stupid_question.mdwn b/doc/forum/A_really_stupid_question.mdwn new file mode 100644 index 0000000000..38c7bcb56a --- /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?