urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2008-01-21 13:56:42 -05:00
parent dd8e209fd8
commit e3265a311a
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/setup/discussion.mdwn
View File

@ -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?