diff options
| author | http://bob-bernstein.myopenid.com/ <bernstein@web> | 2014-05-26 00:26:19 -0400 |
|---|---|---|
| committer | admin <admin@branchable.com> | 2014-05-26 00:26:19 -0400 |
| commit | c561e8c0fe04e6bebdb85b12e0e00dff22fb6178 (patch) | |
| tree | e0aba227108cbb0aabfc46816695881690a48976 | |
| parent | 595bbdad9a642f901a4b6f6cbee30a7c80c08b9d (diff) | |
| download | ikiwiki-c561e8c0fe04e6bebdb85b12e0e00dff22fb6178.tar ikiwiki-c561e8c0fe04e6bebdb85b12e0e00dff22fb6178.tar.gz | |
Added a comment: FIXED! YIPPEE!
| -rw-r--r-- | doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_1_2223c8b463b22a9dab53b71c01b67209._comment | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_1_2223c8b463b22a9dab53b71c01b67209._comment b/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_1_2223c8b463b22a9dab53b71c01b67209._comment new file mode 100644 index 000000000..b306c9bcf --- /dev/null +++ b/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_1_2223c8b463b22a9dab53b71c01b67209._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://bob-bernstein.myopenid.com/" + nickname="bernstein" + subject="FIXED! YIPPEE!" + date="2014-05-26T04:26:17Z" + content=""" +Just diddling around I got the old copy of sidebar.mdwn out of the way, i.e. I moved it out of, not the .git directory in my home dir, but the \"plain\" one. I really ought to learn the names of these things. At any rate it was what git called my \"local copy,\" so I got it out of there. + +Now with the logjam broken I can edit, commit, and push changes, apparently, 'til the cows come home. + +Thank yourse A::! +"""]] |