From 3b6f3db257cd4471324ecb98e056598dc4b9bd82 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Wed, 5 Jun 2019 15:08:02 +0000 Subject: Added a comment --- .../comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment (limited to 'doc/forum') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment new file mode 100644 index 00000000..2b169a57 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 5" + date="2019-06-05T15:08:02Z" + content=""" +You can pass `-X theirs --allow-unrelated-histories` or similar. +"""]] -- cgit v1.2.3