Git

git

if someone has changed a repository and pushed it up and then someone else tries to push they can't. They first need to pull and merge. If they tried to modify the same file then you may need to manually merge, resolve and push.

git pull = fetch + merge and is shortcut for pull origin master

always commit before merge and pull

head is latest commited version on your machine

head

head orig

http://mckennatim.github.com/mckennatim

the gh_page index.html is in pathboston.com/mckennatim/mckennatim. Go all the way there you should see

root@10.0.1.20: mckennatim$ (gh-pages *)  git add .
root@10.0.1.20: mckennatim$ (gh-pages +)  git commit -m "appmkt"
[gh-pages 1e8feac] appmkt
 1 files changed, 3 insertions(+), 1 deletions(-)
root@10.0.1.20: mckennatim$ (gh-pages)  git push
Counting objects: 5, done.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 437 bytes, done.
Total 3 (delta 2), reused 0 (delta 0)
To git@github.com:mckennatim/mckennatim.git
   bfd5b64..1e8feac  gh-pages -> gh-pages
root@10.0.1.20: mckennatim$ (gh-pages)

the work flow

The idea is to have production code on server and then a copy of that code locally. That copy has a branch that you can try fixes in. When the fixes are working well locally you can try them on the server from the same branch. When they are ready to go live you can merge the branch with the master locally, push it to github and fetch from github to the server where you merge the github master into the server master.

the setup

by cloning from github

Started by cloning code on your local machine(which creates a remote named 'origin')

$ git clone git@github.com:mckennatim/OBsoup.git

Then create a branch for putting new features:

$ git checkout -b loco
Switched to a new branch 'loco'

starting on a local drive

To make your current directory a Git repository we simply run init.

git init
git add .
git commit -m "initial commit"

Create a new repository on GitHub. It will tell you something like the following

 cd existing_git_repo
 git remote add origin git@github.com:mckennatim/food2buy.git
 git pull origin master //I think this just gets Read.me
 git push -u origin master

Enter passphrase for key '/c/Users/tim/.ssh/id_rsa': nj.

=remove sensitive data (doesn't work)

tekkub@iSenberg ~/tmp/github-gem master
$ echo "Rakefile" >> .gitignore

tekkub@iSenberg ~/tmp/github-gem master*
$ git add .gitignore

tekkub@iSenberg ~/tmp/github-gem master+
$ git commit -m "Add Rakefile to .gitignore"
[master 051452f] Add Rakefile to .gitignore
 1 files changed, 1 insertions(+), 0 deletions(-)

normal test process

locally

do some editing locally on a (loco)branch and test locally then add. and commit locally

(loco)$git add .
(loco)$git commit -m "my local edits"

push that branch to github

(loco)$git push origin loco

server

If you changed or added files without using version control by mistake. (you get an error like "error: Untracked working tree file '.htaccess' would be overwritten by merge. Aborting")

 git clean -f

before fetch and merge

If you had an old loco branch get rid of it before you add another

 ssh -i .ssh/hpkey.pem root@107.21.243.191
 (master)$ git branch -D loco

try the local changes by fetching the github origin then fast-forward the server branch by

(master)$git fetch origin 
(master)$git merge origin/loco
(master)$git checkout loco
(loco) 

Now the server is running from the loco branch. If you want it running from the older master code

(loco)$git checkout master
(master)$

once new code is tested on server from (loco)

Decided the protocal is to start merging branch into master locally then pushing it to GitHub then fetching from Github to server and merging there.

locally

OK so the branch can merge into master locally

(local)$ git checkout master
(master)$ git merge loco

Then push it to github

(master)$ git push

server

Get the merged master from github and mege it with the servers master

(master)$git fetch origin 
(master)$git merge origin/master