summaryrefslogtreecommitdiff
path: root/doc/forum/Fail_to_push_changes_when_merging
diff options
context:
space:
mode:
authorarnaud@30aba4d9f1742050874551d3ddc55ca8694809f82015-12-08 07:04:21 +0000
committeradmin2015-12-08 07:04:21 +0000
commit71fa3b45bc8838c12d9480db052d2a9a2726da44 (patch)
tree9de4324760de86bfe6684660622be0016aaafe12 /doc/forum/Fail_to_push_changes_when_merging
parent6cfb69fb8549f33c88b321f173a2e1a5851ad0e2 (diff)
Added a comment
Diffstat (limited to 'doc/forum/Fail_to_push_changes_when_merging')
-rw-r--r--doc/forum/Fail_to_push_changes_when_merging/comment_2_4c8e1d9409b8ecfc465550fbbf5c0708._comment8
1 files changed, 8 insertions, 0 deletions
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?
+"""]]