\t\t\t\tI like to use are two kinds of branches, features (aka enhancement \/ story) and issues. A single feature can encapsulate a group of enhancements or even a sprint. We can be flexible here as creating too many branches will slow us down. An issue is a bug, a configuration change or some kind of task that involves a code change.
\nThe naming convention is:-
\nfeature-name e.g. feature-add-currency-prices
\nissue-name e.g. issue-prices-not-appearing<\/p>\n
To create a branch on an project that you have previously cloned and as a side effect also switch to the branch To switch to an existing branch first make sure you have the latest repo which includes the branch Finally merge to master Eclipse didn’t do a good job of branching but once the branch is setup it does recognise the branch and can be used for commit and after the first manual push.<\/p>\n To tag the master after a successful test to say v-0.2.6 To see what commits are waiting to be pushed https:\/\/www.atlassian.com\/git\/workflows#!workflow-feature-branch I like to use are two kinds of branches, features (aka enhancement \/ story) and issues. A single feature can encapsulate a group of enhancements or even a sprint. We can be flexible here as creating too many branches will … Continue reading git branch <\/code>
\nOr for remote branches not in your repository
\ngit branch -a<\/code><\/p>\nCreating a Branch<\/h3>\n
\ngit checkout -b feature-add-currency-prices <\/code>
\nMake some changes, commit them in the usual way. Then push to the repository and add the branch to the repository so that others can see it
\ngit push -u origin feature-add-currency-prices<\/code>
\nAnd simply do
\ngit push<\/code>
\nsubsequently<\/p>\nUsing an Existing Branch<\/h3>\n
\ngit pull <\/code>
\nThen checkout the branch and switch to it
\ngit checkout feature-add-currency-prices<\/code>
\nMake git changes and commit in the usual way and then when its time to push
\ngit push -u origin feature-add-currency-prices<\/code>
\nAfter that git remembers your branch so you can simply type
\ngit push<\/code><\/p>\nMerging to Master<\/h3>\n
\ngit checkout master
\ngit pull
\ngit pull origin feature-add-currency-prices
\ngit push origin master <\/code><\/p>\nMerging changes from Master to a branch<\/h3>\n
git checkout master
\ngit pull
\ngit checkout feature-add-currency-prices
\ngit pull\u00a0origin feature-add-currency-prices
\ngit merge master
\n-- there maybe conflicts at this point
\ngit status
\n-- after all\u00a0conflicts\u00a0are resolved
\ngit push\u00a0origin feature-add-currency-prices
\n<\/code><\/p>\nIssues<\/h3>\n
Tags<\/h3>\n
\n
\ngit tag -a v-0.2.6 -m 'v-0.2.6'
\ngit push origin v-0.2.6
\n<\/code><\/p>\nTips<\/h3>\n
\ngit log --branches --not --remotes<\/code>
\nFor a list of files to be pushed, run
\ngit diff --stat --cached origin\/master<\/code>
\nTo delete a branch
\ngit branch -d branch_name<\/code>
\nTo remove from origin
\ngit push origin :branch_name<\/code><\/p>\nReferences<\/h4>\n
\nhttp:\/\/reinh.com\/blog\/2009\/03\/02\/a-git-workflow-for-agile-teams.html
\nhttp:\/\/marklodato.github.io\/visual-git-guide\/index-en.html
\nhttp:\/\/nvie.com\/posts\/a-successful-git-branching-model
\nhttp:\/\/rogerdudler.github.io\/git-guide\/\t\t<\/p>\n","protected":false},"excerpt":{"rendered":"