From: Joey Hess <joey@kitenet.net>
Date: Mon, 21 Jan 2008 18:56:42 +0000 (-0500)
Subject: web commit by http://scottschulz.us/: Request for assistance
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/e3265a311a77aec7a76cedb66a004ea6c2a6178c

web commit by http://scottschulz.us/: Request for assistance
---

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 100ea5755..0ccecb8e2 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -86,3 +86,22 @@ What is the syntax for specifying the adminuser as an openid user?  I've tried a
 
 > Just put the openid url in there. It has to be the full url with
 > "http://". --[[Joey]]
+
+----
+
+I apologize if this is the incorrect forum for this question, but I am trying to get ikiwiki set up and running with git.  I followed all the directions and all seems to work until I go back and try to make changes.  The steps I am performing:
+
+    cd $SRCDIR  (e.g. ~/ikisrc)
+    vim index.mdwn (add a couple lines)
+    git commit -a -m 'test'
+    git push
+
+I then get a long error message which reads in part "You asked me to pull without telling me which branch you
+want to merge with, and 'branch.master.merge' in your configuration file does not tell me either." From that point on, I get:
+
+    sws@odin:~/dev/ikisrc$ git push
+    To /home/git/repos/myikiwiki.git
+     ! [rejected]        master -> master (non-fast forward)
+    error: failed to push to '/home/git/repos/myikiwiki.git'
+
+If I do a git clone ssh://odin/path/to/$REPOSITORY from another machine and try to edit I get the same error sequence.  What am I doing wrong?