Added a comment: FIXED! YIPPEE!
authorhttp://bob-bernstein.myopenid.com/ <bernstein@web>
Mon, 26 May 2014 04:26:19 +0000 (00:26 -0400)
committeradmin <admin@branchable.com>
Mon, 26 May 2014 04:26:19 +0000 (00:26 -0400)
doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:/comment_1_2223c8b463b22a9dab53b71c01b67209._comment [new file with mode: 0644]

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 (file)
index 0000000..b306c9b
--- /dev/null
@@ -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::!
+"""]]