Adsense
Popular Posts
- MySQL workbench -"Could not decrypt password cache"
- peer review (3)
- PHP, dump varailbes in a format way
- "Unusual traffic from your computer network" from blogger
- Install APXS in Redhat Linux
- JavaScript, remove trailing insignificant zeros after toFixed function
- Update member directory
- Set Windows path command line
- JavaScript: add days to current date
- DataTable table order by numeric, not by text
Tuesday, March 4, 2014
Example of Git in colloborator mode
Git is a free and open source distributed version control system
Git can be downloaded from:
http://git-scm.com/
Self git host
gitosis
https://github.com/tv42/gitosis
gitolite
https://github.com/sitaramc/gitolite
For collaborative work flow
My flow:
> git checkout master
>git fetch
>git merge origin/master
now create another branch test_website, better directly working o9n master branch
>git checkout b test_website
//modify index.php and put in staging
>git add index.php
//then put in git repository
>git commit -m "add contact in index.php"
>git fetch
>git push -u origin test_website
My collaborator flow
> git checkout master
>git fetch
>git merge origin/master
check out my work
>git checkout -b test_website origin/test_website
check out what I did
> git log
He make some change on the code and commit
>git commit -am "add jiansen in contact.php"
make sure the local code up-to-date using fetch
>git fetch
push the code in remote
>git push
Back to my flow
>git fetch
>git log -p test_website..origin/test_website
sync my local test_website
>git merge origin/test_website
go back master branch
>git checkout master
>git fetch
>git merge origin/master
merge in branch test_website in master
>git merge test_website
update remote
>git push
Subscribe to:
Post Comments (Atom)
No comments:
Post a Comment