Git branching model_for_tap_team

338 views

Published on

Published in: Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
338
On SlideShare
0
From Embeds
0
Number of Embeds
2
Actions
Shares
0
Downloads
2
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Git branching model_for_tap_team

  1. 1. Git branching model for TAP Team Grzegorz Wilczyński Wrocław twitter.com/wilq_ 10th October 2012github.com/gwilczynski
  2. 2. What we are notgoing to talk about ...
  3. 3. 1e6758a0f3af82cb3c23f801d861ca65f6d3e4462a1a174fe56d1c5b754884fb6bce777d0a09feaf12b2c7af5f40d23a3c8c6642bfedc6789715d2d9b3c0a9bbbfdbcb1e2df6dfb51adaa6a60baa5e19
  4. 4. $ git branch gw-test$ git checkout gw-test$ vim gw-test.txt$ git add .$ git commit -m "added something"$ git push origin gw-test
  5. 5. And the answer is...
  6. 6. New Merge Request
  7. 7. Manual$ git checkout master$ git fetch origin$ git merge origin/gw-test2$ git push origin master
  8. 8. $ git fetch originAt this point the repository has all the commits from theoriginal repository, but they are not integrated into thethe cloned repository’s local branches.
  9. 9. Git Landscaping# Be sure everything is up to date.$ git checkout master$ git pull# Remove remote tracking branches which no longerexist.$ git remote prune origin# See what branches are merged.$ git branch -r --merged master
  10. 10. Mr Clean# Remote$ git push origin :gw-test# Local$ git branch -d gw-test
  11. 11. Branch Prefixing- You know who is responsible for deleting eachbranch- You can find all your branches quickly with tabcompletion- You can easily find a teammate’s branch withonly a general idea of its name.
  12. 12. Sourceshttp://robots.thoughtbot.com/post/29355216290/git-landscapinghttp://robots.thoughtbot.com/post/21306813001/remote-branchhttp://gitlabhq.com/http://git-scm.com/http://gitimmersion.com/

×