nickfloyd

git remote add upstream [git repo endpoint]
git fetch upstream

git merge upstream/master

nickfloyd

Chat Subject:FiOS Internet (Slow Speed)
Your Question:This is the 3rd time I have contacted support in the past month and have had a service tech out - I can only sporadically connect and now when I do I get terrible speed. http://www.speedtest.net/result/1725566801.png
A Verizon Service Representative will be with you shortly. Thank you.
Agent Nehru has joined. (11:06:26)

Nehru : Chat ID for this session is 01231210435. (11:06:26)

Nehru(11:06:31): Thank you for contacting Verizon FIOS technical chat support. My name is Nehru; we appreciate your patience in reaching us.

Nehru(11:06:51): May I have your FIOS home phone number?

nickfloyd

#Create .bashrc in $HOME if one does not exist
touch ~/.bashrc

#add aliases for each commonly used solution - replacing PROJECTNAME and PROJECT with their actual names
alias psln='cd /c/dev/PROJECT && start /c/dev/PROJECT/PROJECTNAME.sln /D /c/dev/PROJECT/'
alias ifsln='cd /c/dev/PROJECT && start /c/dev/PROJECT/PROJECTNAME.sln /D /c/dev/PROJECT/'

nickfloyd

Global setup:
 Set up git
  git config --global user.name "FirstName LastName"
  git config --global user.email youremail@gmail.com
        
Next steps:
  mkdir test
  cd test
  git init
  touch README

nickfloyd

//This returns a 404 not found - powershell; I expected a 401 if my creds were bad
$Url = "https://github.com/api/v2/xml/commits/list/fellowshiptech/portal/Portal_2011.6.23_15-26"
$webclient = new-object system.net.webclient
$webclient.credentials = new-object system.net.networkcredential("user", "password")
$result = $webclient.DownloadString($Url)
$result

//This returns the data I want via terminal
curl -u user:password https://github.com/api/v2/xml/commits/list/fellowshiptech/portal/Portal_2011.6.23_15-26

nickfloyd

sudo rails -s -p80

using rvm

rvmsudo rails server -p80

nickfloyd

#create a passenger host config file
touch /etc/apache2/passenger_pane_vhosts/[site].local.vhost.conf

#contents ++++++++++++++++++

<VirtualHost *:80>
  ServerName site.local
  DocumentRoot "/Users/nfloyd/code/rails/site/public"
  RackEnv development
  <Directory "/Users/nfloyd/code/rails/site/public">

nickfloyd

git push -f origin HEAD\^:master


so commit history in the remote looks like:

Had to clean up some things from the merge 
nickfloyd (author)
January 26, 2011
commit  4bcce9878c454ba5583c
tree    e6f4cffa47b1301a4cfc

nickfloyd

-Go to the starting point of the project
>> git checkout origin master
-fetch all objects
>> git fetch origin
-Make the branch from the tag
>> git branch new_branch tag_name
-Checkout the branch
>> git checkout new_branch
-Push the branch up
>> git push origin new_branch

nickfloyd

ex.
git checkout origin master
git pull origin master

--create branch and track master
git checkout -b f1-1234 origin/master
--make changes

--resolve conflicts, DO NOT PUSH branch, the merge is just to resolve conflicts