+
+----
+
+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?
+
+-----
+
+I follow every steps of the setup procedure, change some templates and tried to modify some page through the web but was not able to do so. Every page seems to be locked by the adminuser user. When I remove the adminuser in the setup file, every ran fine. Did I miss something ? What is exactly the adminuser supposed to be allowed to ? Is he the only user allowed to modify pages ?
+
+> This was a bug in ikwiki that was fixed in version 2.44. --[[Joey]]