In my first attempt to edit in a text editor I chose sidebar.mdwn. I committed it after the editing, and get this when I execute "git push:"

$ git push

Counting objects: 5, done.

Delta compression using up to 8 threads.

Compressing objects: 100% (3/3), done.

Writing objects: 100% (3/3), 289 bytes, done.

Total 3 (delta 2), reused 0 (delta 0)

Unpacking objects: 100% (3/3), done.

remote: From /home/zoidberg/Zoidwicky

remote:    e878e6a..0ac0c44  master     -> origin/master

remote: error: Your local changes to the following files would be overwritten by merge:

remote:     sidebar.mdwn

remote: Please, commit your changes or stash them before you can merge.

remote: Aborting

remote: 'git pull --prune origin' failed:  at /usr/share/perl5/IkiWiki/Plugin/ line 218.

To /home/zoidberg/Zoidwicky.git

   e878e6a..0ac0c44  master -> master

I have committed my changes to sidebar.mdwn and given my reason for doing so. Also, I get this complaint about sidebar.mdwn when I try 'git push' after editng other files. So I am stuck here. Pls. help.

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::!

Comment by bernstein Mon May 26 00:26:17 2014

Make that last line, above:

Thank youse ALL!

Comment by bernstein Mon May 26 00:29:44 2014