search

presslabs / gitium

Keep all your WordPress code on git with a simple plugin and a repo
https://www.presslabs.com/code/gitium/
GNU General Public License v2.0
180 stars 31 forks source link

PHP error on GIT error #183

Closed cristianuibar closed 5 years ago

cristianuibar commented 5 years ago 
Sep 19/2019 19:41:14 > PHP User Error: Failed merge & push: s:449:"error: failed to push some refs to 'git@git.presslabs.net:fanatik/fanatik.git'
Sep 19/2019 19:41:14 > hint: Updates were rejected because the tip of your current branch is behind
Sep 19/2019 19:41:14 > hint: its remote counterpart. Integrate the remote changes (e.g.
Sep 19/2019 19:41:14 > hint: 'git pull ...') before pushing again.
Sep 19/2019 19:41:14 > hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Sep 19/2019 19:41:14 > To git@git.presslabs.net:fanatik/fanatik.git
Sep 19/2019 19:41:14 > !\x09HEAD:refs/heads/merge_local\x09[rejected] (non-fast-forward)
Sep 19/2019 19:41:14 > Done"; in /www/presslabs/git-webhook.php on line 37 when calling trigger_error(), request: GET /git-webhook.php, request_id: bb5a7f28912b6d94707d51367bb65605
cristianuibar commented 5 years ago

Duplicate of #144 . Closing ...