X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d312709c416944cab8e8e3ad09d47b69f9049931..8b54578882e17fe8c059515902e9d19fd80c2896:/doc/setup/discussion.mdwn?ds=inline

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 97c4cb93b..0ccecb8e2 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -41,6 +41,8 @@ see some mentions of changes in git's changelog for 1.5.3 that look
 relevant. I've changed ikiwiki-makerepo to use a method more portable to
 older versions of git. --[[Joey]]
 
+Many thanks Joey, upgraded my git, and now have working iki :) -- Andy
+
 ----
 
 It isn't intended that .ikiwiki be versioned, is it? Do you have a svn:ignore set? 
@@ -77,3 +79,29 @@ directory back into the wiki's working copy directory, isn't it? --[[tschwinge]]
 Curious as to why support for CVS is not built in. --[[Luther]]
 
 > See [[todo/CVS_backend|todo/CVS_backend]], but you might consider switching to a better version control system. --[[JoshTriplett]]
+
+----
+
+What is the syntax for specifying the adminuser as an openid user?  I've tried a couple things but I'm missing something.   Thanks for any pointers.  -- [[AdamShand]]
+
+> 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?