diff options
| author |  http://joeyh.name/ <http://joeyh.name/@web> | 2014-01-01 20:31:34 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-01-01 20:31:34 +0000 |
| commit | c0b9c7b6837590f1207f76714f0dc7ca6200957a (patch) | |
| tree | 7a70cda4dcc7a75968f2d264015a6c02e81235d0 | |
| parent | 7d4f6007803c43ebf7cef9d5f6968d2b713c60e4 (diff) | |
Added a comment
| -rw-r--r-- | doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment new file mode 100644 index 000000000..3b1383376 --- /dev/null +++ b/doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.227" + subject="comment 1" + date="2014-01-01T20:31:21Z" + content=""" +I think you can fix at least the immediate problem by deleting the .git/MERGE_HEAD file. + + +"""]] |