{"action":"created","issue":{"url":"https://api.github.com/repos/FRC-Team-3140/FRC2015Code/issues/13","labels_url":"https://api.github.com/repos/FRC-Team-3140/FRC2015Code/issues/13/labels{/name}","comments_url":"https://api.github.com/repos/FRC-Team-3140/FRC2015Code/issues/13/comments","events_url":"https://api.github.com/repos/FRC-Team-3140/FRC2015Code/issues/13/events","html_url":"https://github.com/FRC-Team-3140/FRC2015Code/issues/13","id":58990933,"number":13,"title":"Merging the two branches","user":{"login":"RccCookie","id":10505747,"avatar_url":"https://avatars.githubusercontent.com/u/10505747?v=3","gravatar_id":"","url":"https://api.github.com/users/RccCookie","html_url":"https://github.com/RccCookie","followers_url":"https://api.github.com/users/RccCookie/followers","following_url":"https://api.github.com/users/RccCookie/following{/other_user}","gists_url":"https://api.github.com/users/RccCookie/gists{/gist_id}","starred_url":"https://api.github.com/users/RccCookie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/RccCookie/subscriptions","organizations_url":"https://api.github.com/users/RccCookie/orgs","repos_url":"https://api.github.com/users/RccCookie/repos","events_url":"https://api.github.com/users/RccCookie/events{/privacy}","received_events_url":"https://api.github.com/users/RccCookie/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-02-25T23:57:45Z","updated_at":"2015-02-25T23:58:22Z","closed_at":null,"body":"Hey guys, i'm righting this because I'm running into a little bit of a problem, I cannot merge mainstream and upstream together, even though the conflicts are minor, I receive the dreaded \"The user operation is waiting for background work to complete\" when ever I try to save at all (after merging). So, if any of you know how to merge these two branches and or fix my problem (which is happening on two of my computers) then please let me know.\r\n\r\n-Ryan"},"comment":{"url":"https://api.github.com/repos/FRC-Team-3140/FRC2015Code/issues/comments/76088812","html_url":"https://github.com/FRC-Team-3140/FRC2015Code/issues/13#issuecomment-76088812","issue_url":"https://api.github.com/repos/FRC-Team-3140/FRC2015Code/issues/13","id":76088812,"user":{"login":"RccCookie","id":10505747,"avatar_url":"https://avatars.githubusercontent.com/u/10505747?v=3","gravatar_id":"","url":"https://api.github.com/users/RccCookie","html_url":"https://github.com/RccCookie","followers_url":"https://api.github.com/users/RccCookie/followers","following_url":"https://api.github.com/users/RccCookie/following{/other_user}","gists_url":"https://api.github.com/users/RccCookie/gists{/gist_id}","starred_url":"https://api.github.com/users/RccCookie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/RccCookie/subscriptions","organizations_url":"https://api.github.com/users/RccCookie/orgs","repos_url":"https://api.github.com/users/RccCookie/repos","events_url":"https://api.github.com/users/RccCookie/events{/privacy}","received_events_url":"https://api.github.com/users/RccCookie/received_events","type":"User","site_admin":false},"created_at":"2015-02-25T23:58:22Z","updated_at":"2015-02-25T23:58:22Z","body":"Also, as a side-note the code is still working on a local-level when it comes to running the robot, so worse case-scenario we still have the local copy of the autonomous code."}}