Git stuff<\/p>\n
Conceptual description: http:\/\/www.sbf5.com\/~cduan\/technical\/git\/git-1.shtml<\/p>\n
**HEAD is the name given to the commit from which the working tree\u2019s current state was initialized.
\ngit rebase allows you to pull changes from master into your development branch, but leave all of your development work \u201con top of\u201d (later in the commit log) the stuff from master. When your new work is complete, the merge back to master is then very straightforward.<\/p>\n
#Make a local copy of the git repo that you want to work on
\ngit clone URL<\/p>\n
make changes in local repository<\/p>\n
git add changed.file<\/p>\n
git commit -m \u201cnew changes\u201d<\/p>\n
git status<\/p>\n
git push origin master<\/p>\n
When you want to update your local copy with a special branch, do the following:<\/p>\n
#Pull a fresh copy of develop
\ngit checkout develop<\/p>\n
#Look for last minute changes
\ngit pull<\/p>\n
#Check out the feature branch
\ngit checkout feature\/my_special_branch<\/p>\n
#Merge with develop branch you just updated
\ngit merge develop<\/p>\n
**Switching to develop and doing a pull will ensure your local copy is up to date with the most recent develop branch. Then you add in the new feature branch by pulling it and then merging with develop.<\/p>\n","protected":false},"excerpt":{"rendered":"
Git stuff Conceptual description: http:\/\/www.sbf5.com\/~cduan\/technical\/git\/git-1.shtml **HEAD is the name given to the commit from which the working tree\u2019s current state was initialized. git rebase allows you to pull changes from master into your development branch, but leave all of your … Continue reading