{"action":"created","issue":{"url":"https://api.github.com/repos/DUWS-R-Team/DUWS-R/issues/103","labels_url":"https://api.github.com/repos/DUWS-R-Team/DUWS-R/issues/103/labels{/name}","comments_url":"https://api.github.com/repos/DUWS-R-Team/DUWS-R/issues/103/comments","events_url":"https://api.github.com/repos/DUWS-R-Team/DUWS-R/issues/103/events","html_url":"https://github.com/DUWS-R-Team/DUWS-R/pull/103","id":72543443,"number":103,"title":"Sell Resources and Taxi Fixes","user":{"login":"bolbies","id":3967787,"avatar_url":"https://avatars.githubusercontent.com/u/3967787?v=3","gravatar_id":"","url":"https://api.github.com/users/bolbies","html_url":"https://github.com/bolbies","followers_url":"https://api.github.com/users/bolbies/followers","following_url":"https://api.github.com/users/bolbies/following{/other_user}","gists_url":"https://api.github.com/users/bolbies/gists{/gist_id}","starred_url":"https://api.github.com/users/bolbies/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bolbies/subscriptions","organizations_url":"https://api.github.com/users/bolbies/orgs","repos_url":"https://api.github.com/users/bolbies/repos","events_url":"https://api.github.com/users/bolbies/events{/privacy}","received_events_url":"https://api.github.com/users/bolbies/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":7,"created_at":"2015-05-01T23:02:33Z","updated_at":"2015-05-03T15:04:04Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/DUWS-R-Team/DUWS-R/pulls/103","html_url":"https://github.com/DUWS-R-Team/DUWS-R/pull/103","diff_url":"https://github.com/DUWS-R-Team/DUWS-R/pull/103.diff","patch_url":"https://github.com/DUWS-R-Team/DUWS-R/pull/103.patch"},"body":"Very basic \"Sell Resource\" script. It only checks the condition of the\r\nengine as of right now. Wheels are finicky but I'll figure something out\r\neventually. I'll also eventually add rear rotor for helis and etc for\r\ncertain vehicles. As for the taxi, you no longer have to call it from\r\nthe base first. It'll fly straight there on its first run."},"comment":{"url":"https://api.github.com/repos/DUWS-R-Team/DUWS-R/issues/comments/98490802","html_url":"https://github.com/DUWS-R-Team/DUWS-R/pull/103#issuecomment-98490802","issue_url":"https://api.github.com/repos/DUWS-R-Team/DUWS-R/issues/103","id":98490802,"user":{"login":"fritogotlayed","id":5406580,"avatar_url":"https://avatars.githubusercontent.com/u/5406580?v=3","gravatar_id":"","url":"https://api.github.com/users/fritogotlayed","html_url":"https://github.com/fritogotlayed","followers_url":"https://api.github.com/users/fritogotlayed/followers","following_url":"https://api.github.com/users/fritogotlayed/following{/other_user}","gists_url":"https://api.github.com/users/fritogotlayed/gists{/gist_id}","starred_url":"https://api.github.com/users/fritogotlayed/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fritogotlayed/subscriptions","organizations_url":"https://api.github.com/users/fritogotlayed/orgs","repos_url":"https://api.github.com/users/fritogotlayed/repos","events_url":"https://api.github.com/users/fritogotlayed/events{/privacy}","received_events_url":"https://api.github.com/users/fritogotlayed/received_events","type":"User","site_admin":false},"created_at":"2015-05-03T15:04:04Z","updated_at":"2015-05-03T15:04:04Z","body":"Hey. I'm not sure what tool you're using to manage your Git repo so I'm going to go with Git Bash. \r\n\r\n** This whole section is 'one time' configuration **\r\nFirst we'll make sure that your local computer knows about the central code repository\r\n* `git remote -v` <-- Lists all the remotes your computer knows about. \r\n* At this point you'll want to make sure there are the following two lines in the output\r\n  * `upstream        [[something here]] (fetch)`\r\n  * `upstream        [[something here]] (push)`\r\n\r\n** Now we're on to what you really want to do\r\nNext make sure you don't have any changes on your branch\r\n* `git checkout DUWS_additions` <-- This puts you on your DUWS_additions branch\r\n* `git status` <-- Make sure this says \"working directory clean\"  \r\n\r\nThen we'll sync up your local branch `master` and your `origin` branch master with upstreams `master`\r\n* `git checkout master` <-- put you on your local master\r\n* `git fetch upstream` <-- find out what changes are in upstream\r\n* `git rebase upstream/master` <-- sync up local master with upstream master\r\n  * At this point you should get a clean rebase. If you don't the branch name in git bash will say something like (master | REBASING) if I recall correctly. If it does that you'll most likely either need to abort the rebase or figure out how to merge the changes. \r\n* Assuming no conflicts... `git push origin master:master` <-- make github's `master` branch sync with your local computer `master` branch\r\n\r\nWow, that was a bunch. The nice thing is that getting your `DUWS_additions` branch in sync is pretty much the same process. I can guarantee you that you'll have conflicts here though. Lets get things synced up here now...\r\n* `git checkout DUWS_additions` <-- switch back to the \"additions\" branch\r\n* `git rebase master` <-- note this one doesn't say \"upstream/master\". That is because at this point we've already made sure that your local master is in-sync with upstreams master. Now we can use our local master as the point with which to rebase.\r\n  * At this point you'll definitely have the git bash name say something like \"(DUWS_additions | REBASING). \r\n* You can start merging your changes by using whatever merge tool you are comfortable with. I don't recall what the default merge tool is for Git Bash but you can run it by typing in `git mergetool`. It will list what files have conflicts and display each set of files to you. You just press enter and the merge tool with expand letting you perform the merge :smile: \r\n\r\nNow, I know all of that is a bunch of information to take in. If you'd like and/or you get stuck feel free to ping me on steam and we can look at the merge together. I have a friends child's birthday party to go to so I'm going to be away from the house a good chunk of the day. If you'd like though I usually use https://www.join.me to share screen. It's free and pretty light weight so I usually use it with my parents who are not computer savvy.\r\n"}}