From 71fa3b45bc8838c12d9480db052d2a9a2726da44 Mon Sep 17 00:00:00 2001 From: arnaud@30aba4d9f1742050874551d3ddc55ca8694809f8 Date: Tue, 8 Dec 2015 07:04:21 +0000 Subject: Added a comment --- .../comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Fail_to_push_changes_when_merging/comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment diff --git a/doc/forum/Fail_to_push_changes_when_merging/comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment b/doc/forum/Fail_to_push_changes_when_merging/comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment new file mode 100644 index 00000000..47eb9f6a --- /dev/null +++ b/doc/forum/Fail_to_push_changes_when_merging/comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="arnaud@30aba4d9f1742050874551d3ddc55ca8694809f8" + nickname="arnaud" + subject="comment 2" + date="2015-12-08T07:04:21Z" + content=""" +Thanks, I will try that. But why does it not happen when updating with fast-forward? +"""]] -- cgit v1.2.3