diff options
Diffstat (limited to 'doc/bugs')
| -rw-r--r-- | doc/bugs/error:_failed_to_push_some_refs_to___39__ssh:__47____47__git__64__localhost__47__brains.git__39__.mdwn | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/doc/bugs/error:_failed_to_push_some_refs_to___39__ssh:__47____47__git__64__localhost__47__brains.git__39__.mdwn b/doc/bugs/error:_failed_to_push_some_refs_to___39__ssh:__47____47__git__64__localhost__47__brains.git__39__.mdwn new file mode 100644 index 000000000..da2b0ef98 --- /dev/null +++ b/doc/bugs/error:_failed_to_push_some_refs_to___39__ssh:__47____47__git__64__localhost__47__brains.git__39__.mdwn @@ -0,0 +1,46 @@ +Some people in our office edit ikiwiki via command line, and others via the Web interface. At a certain point, the following error popped up in Apache error logs: + +```` +To ssh://git@localhost/brains.git + d7e8496..8a75b3b master -> master +Switched to branch 'throw_away_8a75b3b1da256452ae87b8543b5bec3d2f586ac5' +Switched to branch 'master' +From . + * branch throw_away_8a75b3b1da256452ae87b8543b5bec3d2f586ac5 -> FETCH_HEAD +Automatic merge went well; stopped before committing as requested +Already on 'master' +To ssh://git@localhost/brains.git + ! [rejected] master -> master (fetch first) +error: failed to push some refs to 'ssh://git@localhost/brains.git' +hint: Updates were rejected because the remote contains work that you do +hint: not have locally. This is usually caused by another repository pushing +hint: to the same ref. You may want to first integrate the remote changes +hint: (e.g., 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. +'git push origin master' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 220. +From ssh://localhost/brains + 927cc73..29c557b master -> origin/master +'git pull --prune origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 220. +fatal: cannot do a partial commit during a merge. +error: Pull is not possible because you have unmerged files. +hint: Fix them up in the work tree, and then use 'git add/rm <file>' +hint: as appropriate to mark resolution and make a commit. +fatal: Exiting because of an unresolved conflict. +'git pull --prune origin' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 220. +fatal: cannot do a partial commit during a merge. +error: Pull is not possible because you have unmerged files. +hint: Fix them up in the work tree, and then use 'git add/rm <file>' +hint: as appropriate to mark resolution and make a commit. +fatal: Exiting because of an unresolved conflict. +... +```` + +It looks like commits via the Web interface continued to appear to work mostly as normal, but weren't being commited in the public facing git repo that contains the `.ikiwiki/` directory. I did notice a page that I edited contained ">>>>>" text, but not "====.." or "<<<<.." text in the Web version, but not in my git checkout (from the master git repo). Also some people reported problems with the Web interface after the fact. + +When I went in to fix the repo, I quickly removed those uncommitted changes, but that was clearly a mistake, because I lost the edits that had been created via the Web after a certain point in time. + +We're using ikiwiki version 3.20160121 on Trisquel 8, which is based on Ubuntu 16.04. + +If you have any thoughts about what caused this issue, I'd be happy to hear it. At this point, we've mostly moved on from the data loss. + +Thanks! : ) |