From: http://bob-bernstein.myopenid.com/ <bernstein@web>
Date: Sun, 25 May 2014 20:34:37 +0000 (-0400)
Subject: (no commit message)
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/bb80c15b72122649a98663c13af1e114370efd87

---

diff --git a/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:.mdwn b/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:.mdwn
new file mode 100644
index 000000000..128bb8554
--- /dev/null
+++ b/doc/forum/Your_local_changes_to_the_following_files_would_be_overwritten_by_merge:.mdwn
@@ -0,0 +1,20 @@
+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/git.pm 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.