urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a comment: FIXED! YIPPEE!

master
http://bob-bernstein.myopenid.com/ 2014-05-26 00:26:19 -04:00 committed by admin
parent 595bbdad9a
commit c561e8c0fe
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_1_2223c8b463b22a9dab53b71c01b67209._comment 100644
View File

@ -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::!
"""]]