summaryrefslogtreecommitdiff
path: root/doc/forum/Fail_to_push_changes_when_merging
diff options
context:
space:
mode:
authorspwhitton2015-12-08 01:20:26 +0000
committeradmin2015-12-08 01:20:26 +0000
commitb433bcad7b04740462b1503bb962d6012a77e27b (patch)
tree4679e51f1a1040439c0c2ab290b55d94738465ec /doc/forum/Fail_to_push_changes_when_merging
parent7a33cc59b25b3c905a297ac26cd33abdc9cf9e69 (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_1_a44e03cbce4c996e136f917d8e06a7bb._comment12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/forum/Fail_to_push_changes_when_merging/comment_1_a44e03cbce4c996e136f917d8e06a7bb._comment b/doc/forum/Fail_to_push_changes_when_merging/comment_1_a44e03cbce4c996e136f917d8e06a7bb._comment
new file mode 100644
index 00000000..751d701a
--- /dev/null
+++ b/doc/forum/Fail_to_push_changes_when_merging/comment_1_a44e03cbce4c996e136f917d8e06a7bb._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ subject="comment 1"
+ date="2015-12-08T01:20:26Z"
+ content="""
+It looks like git is failing because it can't autodetect an e-mail address for root on the target machine. This might be because the target machine does not have a FQDN, but I'm not sure. Try logging into the target machine as root and running
+
+ git config --global user.email root@lending-test.local
+ git config --global user.name root
+
+as it suggests.
+"""]]