{"action":"opened","issue":{"url":"https://api.github.com/repos/earwig/git-repo-updater/issues/33","repository_url":"https://api.github.com/repos/earwig/git-repo-updater","labels_url":"https://api.github.com/repos/earwig/git-repo-updater/issues/33/labels{/name}","comments_url":"https://api.github.com/repos/earwig/git-repo-updater/issues/33/comments","events_url":"https://api.github.com/repos/earwig/git-repo-updater/issues/33/events","html_url":"https://github.com/earwig/git-repo-updater/issues/33","id":178564701,"number":33,"title":"failes for repos wirh local deprecated but unpushed changes with upstream","user":{"login":"childnode","id":192814,"avatar_url":"https://avatars.githubusercontent.com/u/192814?v=3","gravatar_id":"","url":"https://api.github.com/users/childnode","html_url":"https://github.com/childnode","followers_url":"https://api.github.com/users/childnode/followers","following_url":"https://api.github.com/users/childnode/following{/other_user}","gists_url":"https://api.github.com/users/childnode/gists{/gist_id}","starred_url":"https://api.github.com/users/childnode/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/childnode/subscriptions","organizations_url":"https://api.github.com/users/childnode/orgs","repos_url":"https://api.github.com/users/childnode/repos","events_url":"https://api.github.com/users/childnode/events{/privacy}","received_events_url":"https://api.github.com/users/childnode/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2016-09-22T09:44:02Z","updated_at":"2016-09-22T09:44:02Z","closed_at":null,"body":":information_source:  current gitup [dev@f7a060af](https://github.com/earwig/git-repo-updater/commit/f7a060afe6bb4c77819b30d91bd857491e16ad35)\r\n\r\nThe repo:\r\n```\r\n == BRANCHES == \r\n* master  7f6c811 [origin/master] some changes\r\n  master2 b72feb7 [origin/master: 160 ahead, 100 behins] some playground changes\r\n\r\n```\r\n\r\nthe error:\r\n```\r\n/home/marcel/Projects/repo (1 repo):\r\n    repoName:\r\n       Fetching origin (66/66): branch update (master).\r\n        Updating master: done.\r\n        Updating master2: Traceback (most recent call last):\r\n  File \"/usr/local/bin/gitup\", line 11, in <module>\r\n    load_entry_point('gitup==0.4.dev0', 'console_scripts', 'gitup')()\r\n  File \"build/bdist.linux-x86_64/egg/gitup/script.py\", line 137, in run\r\n  File \"build/bdist.linux-x86_64/egg/gitup/script.py\", line 129, in main\r\n  File \"build/bdist.linux-x86_64/egg/gitup/update.py\", line 254, in update_directories\r\n  File \"build/bdist.linux-x86_64/egg/gitup/update.py\", line 240, in _dispatch\r\n  File \"build/bdist.linux-x86_64/egg/gitup/update.py\", line 179, in _update_repository\r\n  File \"build/bdist.linux-x86_64/egg/gitup/update.py\", line 118, in _update_branch\r\n  File \"/usr/local/lib/python2.7/dist-packages/GitPython-2.0.8-py2.7.egg/git/cmd.py\", line 466, in <lambda>\r\n    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)\r\n  File \"/usr/local/lib/python2.7/dist-packages/GitPython-2.0.8-py2.7.egg/git/cmd.py\", line 934, in _call_process\r\n    return self.execute(make_call(), **_kwargs)\r\n  File \"/usr/local/lib/python2.7/dist-packages/GitPython-2.0.8-py2.7.egg/git/cmd.py\", line 718, in execute\r\n    raise GitCommandError(command, status, stderr_value)\r\ngit.exc.GitCommandError: 'git merge-base b72feb7eefef00573061934097cd64266ad60a40 7f6c811d0f7b5896f2f49035a8190176a6cbeb01' returned with exit code 1\r\n\r\n```"}}
{"actor":{"display_login":"childnode"}}