1 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:"
5 Counting objects: 5, done.
7 Delta compression using up to 8 threads.
9 Compressing objects: 100% (3/3), done.
11 Writing objects: 100% (3/3), 289 bytes, done.
13 Total 3 (delta 2), reused 0 (delta 0)
15 Unpacking objects: 100% (3/3), done.
17 remote: From /home/zoidberg/Zoidwicky
19 remote: e878e6a..0ac0c44 master -> origin/master
21 remote: error: Your local changes to the following files would be overwritten by merge:
25 remote: Please, commit your changes or stash them before you can merge.
29 remote: 'git pull --prune origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 218.
31 To /home/zoidberg/Zoidwicky.git
33 e878e6a..0ac0c44 master -> master
35 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.