Git branching model_for_tap_team
-
Upload
grzegorz-wilczynski -
Category
Technology
-
view
212 -
download
0
Transcript of Git branching model_for_tap_team
Git branching model
TAP Team
Grzegorz Wilczyńskitwitter.com/wilq_
github.com/gwilczynski
Wrocław10th October 2012
for
What we are notgoing to talk about ...
1e6758a0f3af82cb3c23f801d861ca65f6d3e446
2a1a174fe56d1c5b754884fb6bce777d0a09feaf
12b2c7af5f40d23a3c8c6642bfedc6789715d2d9
b3c0a9bbbfdbcb1e2df6dfb51adaa6a60baa5e19
$ git branch gw-test
$ git checkout gw-test
$ vim gw-test.txt
$ git add .
$ git commit -m "added something"
$ git push origin gw-test
And the answer is...
New Merge Request
Manual
$ git checkout master$ git fetch origin$ git merge origin/gw-test2$ git push origin master
At this point the repository has all the commits from the original repository, but they are not integrated into the the cloned repository’s local branches.
$ git fetch origin
# Be sure everything is up to date.$ git checkout master$ git pull
# Remove remote tracking branches which no longer exist.$ git remote prune origin
# See what branches are merged.$ git branch -r --merged master
Git Landscaping
# Remote$ git push origin :gw-test
# Local$ git branch -d gw-test
Mr Clean
Branch Prefixing
- You know who is responsible for deleting each branch
- You can find all your branches quickly with tab completion
- You can easily find a teammate’s branch with only a general idea of its name.
http://robots.thoughtbot.com/post/29355216290/git-landscaping
http://robots.thoughtbot.com/post/21306813001/remote-branch
http://gitlabhq.com/
http://git-scm.com/
http://gitimmersion.com/
Sources