1. View local and remote branches
D:\WorkSpace0\gx-desk (master)
$ git branch -a
* master
remotes/origin/master
2. View the local branch
D:\WorkSpace0\gx-desk (master)
$ git branch
* master
3. Create a local branch
D:\WorkSpace0\gx-desk (master)
$ git branch br-1.0.1
$ git branch -a
br-1.0.1
* master
remotes/origin/master
4. Switch branches
D:\WorkSpace0\gx-desk (master)
$ git checkout br-1.0.1
5. Merge the branch to master
D:\WorkSpace0\gx-desk (master)
$ git merge br-1.0.1 --no-ff
Merge made by the 'recursive' strategy.
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[git delete local branch]
git branch -D br
[git delete remote branch]
git push origin :br (with a space after origin)