From b433bcad7b04740462b1503bb962d6012a77e27b Mon Sep 17 00:00:00 2001 From: spwhitton Date: Tue, 8 Dec 2015 01:20:26 +0000 Subject: Added a comment --- .../comment_1_a44e03cbce4c996e136f917d8e06a7bb._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Fail_to_push_changes_when_merging/comment_1_a44e03cbce4c996e136f917d8e06a7bb._comment 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. +"""]] -- cgit v1.2.3