Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git branching model for TAPTeam
Search
Grzegorz Wilczyński
October 10, 2012
Programming
0
920
Git branching model for TAPTeam
Grzegorz Wilczyński
October 10, 2012
Tweet
Share
More Decks by Grzegorz Wilczyński
See All by Grzegorz Wilczyński
REWRITE'EM ALL
gwilczynski
2
460
Chain made out of coins - smart introduction to blockchain
gwilczynski
0
93
WebComponents or shadow side of the Doom
gwilczynski
0
48
clean code
gwilczynski
0
130
git scm in one hour
gwilczynski
0
110
Single responsibility principle
gwilczynski
2
190
Productivity for Programmers
gwilczynski
3
200
JS design patterns
gwilczynski
6
360
Other Decks in Programming
See All in Programming
AIの力でお手軽Chrome拡張機能作り
taiseiue
0
170
SwiftUI Viewの責務分離
elmetal
PRO
0
140
GAEログのコスト削減
mot_techtalk
0
110
Honoのおもしろいミドルウェアをみてみよう
yusukebe
1
200
sappoRo.R #12 初心者セッション
kosugitti
0
230
Immutable ActiveRecord
megane42
0
130
Unity Android XR入門
sakutama_11
0
140
CNCF Project の作者が考えている OSS の運営
utam0k
5
690
お前もAI鬼にならないか?👹Bolt & Cursor & Supabase & Vercelで人間をやめるぞ、ジョジョー!👺
taishiyade
5
3.8k
さいきょうのレイヤードアーキテクチャについて考えてみた
yahiru
3
730
TokyoR116_BeginnersSession1_環境構築
kotatyamtema
0
110
社内フレームワークとその依存性解決 / in-house framework and its dependency management
vvakame
1
550
Featured
See All Featured
How To Stay Up To Date on Web Technology
chriscoyier
790
250k
Scaling GitHub
holman
459
140k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
27
1.9k
Site-Speed That Sticks
csswizardry
3
370
Performance Is Good for Brains [We Love Speed 2024]
tammyeverts
7
630
Principles of Awesome APIs and How to Build Them.
keavy
126
17k
The Power of CSS Pseudo Elements
geoffreycrofte
75
5.5k
Typedesign – Prime Four
hannesfritz
40
2.5k
Intergalactic Javascript Robots from Outer Space
tanoku
270
27k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
356
29k
Product Roadmaps are Hard
iamctodd
PRO
50
11k
Reflections from 52 weeks, 52 projects
jeffersonlam
348
20k
Transcript
Git branching model TAP Team Grzegorz Wilczyński twitter.com/wilq_ github.com/gwilczynski Wrocław
10th October 2012 for
What we are not going to talk about ...
None
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
None
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