{"action":"opened","issue":{"url":"https://api.github.com/repos/slackero/phpwcms/issues/120","labels_url":"https://api.github.com/repos/slackero/phpwcms/issues/120/labels{/name}","comments_url":"https://api.github.com/repos/slackero/phpwcms/issues/120/comments","events_url":"https://api.github.com/repos/slackero/phpwcms/issues/120/events","html_url":"https://github.com/slackero/phpwcms/issues/120","id":55965899,"number":120,"title":"A mistake since merging branch","user":{"login":"jensensen","id":207107,"avatar_url":"https://avatars.githubusercontent.com/u/207107?v=3","gravatar_id":"","url":"https://api.github.com/users/jensensen","html_url":"https://github.com/jensensen","followers_url":"https://api.github.com/users/jensensen/followers","following_url":"https://api.github.com/users/jensensen/following{/other_user}","gists_url":"https://api.github.com/users/jensensen/gists{/gist_id}","starred_url":"https://api.github.com/users/jensensen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jensensen/subscriptions","organizations_url":"https://api.github.com/users/jensensen/orgs","repos_url":"https://api.github.com/users/jensensen/repos","events_url":"https://api.github.com/users/jensensen/events{/privacy}","received_events_url":"https://api.github.com/users/jensensen/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":0,"created_at":"2015-01-29T22:19:12Z","updated_at":"2015-01-29T22:19:12Z","closed_at":null,"body":"I think we're working on the wrong branch.\r\n\r\n**'master' is the default branch.** After cloning the repro you work in 'master'.\r\nBut this branch is 7 commits behind 'modernize'. And 'modernize' actually is 7 commits ahead of 'master'.\r\n**working [default] in 'master' git pull says: there's nothing new!**\r\n\r\n#### You better would have merged 'modernize' into 'master', than 'master' into modernize, i think.\r\n\r\nSo by now, what is the branch we should pull from to work with our local clones?\r\nWhich branch can/should we use NOW on the web server?"}}