diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-12-08 11:55:19 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-08 11:55:19 -0400 |
| commit | 5ecb4944a637c4f28a15746b2ea716850e63a5ab (patch) | |
| tree | 6512231ee0d7dbf5fca53f89ee42993d1acd0de0 | |
| parent | 71fa3b45bc8838c12d9480db052d2a9a2726da44 (diff) | |
comment
| -rw-r--r-- | doc/forum/Fail_to_push_changes_when_merging/comment_3_bdf54ac096c994c33d661b454d89c770._comment | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/forum/Fail_to_push_changes_when_merging/comment_3_bdf54ac096c994c33d661b454d89c770._comment b/doc/forum/Fail_to_push_changes_when_merging/comment_3_bdf54ac096c994c33d661b454d89c770._comment new file mode 100644 index 00000000..a59296a0 --- /dev/null +++ b/doc/forum/Fail_to_push_changes_when_merging/comment_3_bdf54ac096c994c33d661b454d89c770._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2015-12-08T15:53:27Z" + content=""" +Looks like a lacking FQDN indeed. There's a property to fix that! ;) + +Git is also picky about the user having a name. + +AFAIK, git does not make commits for fast-forward merges, but it does for +non-fast-forward merges. I suspect that it's making such a merge in your +case. +"""]] |