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
SRE、開発、QAが協業して挑んだリリースプロセス改革@SRE Kaigi 2025
nealle
3
4.1k
Open source software: how to live long and go far
gaelvaroquaux
0
620
ペアーズでの、Langfuseを中心とした評価ドリブンなリリースサイクルのご紹介
fukubaka0825
2
300
Kubernetes History Inspector(KHI)を触ってみた
bells17
0
200
[JAWS-UG横浜 #79] re:Invent 2024 の DB アップデートは Multi-Region!
maroon1st
1
140
さいきょうのレイヤードアーキテクチャについて考えてみた
yahiru
3
730
データの整合性を保つ非同期処理アーキテクチャパターン / Async Architecture Patterns
mokuo
41
15k
sappoRo.R #12 初心者セッション
kosugitti
0
230
[JAWS-UG横浜 #80] うわっ…今年のServerless アップデート、少なすぎ…?
maroon1st
1
170
DevinとCursorから学ぶAIエージェントメモリーの設計とMoatの考え方
itarutomy
1
640
知られざるDMMデータエンジニアの生態 〜かつてツチノコと呼ばれし者〜
takaha4k
4
1.3k
chibiccをCILに移植した結果 (NGK2025S版)
kekyo
PRO
0
210
Featured
See All Featured
Writing Fast Ruby
sferik
628
61k
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
28
9.3k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
chriscoyier
507
140k
The Invisible Side of Design
smashingmag
299
50k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
129
19k
Designing Dashboards & Data Visualisations in Web Apps
destraynor
231
53k
How to Think Like a Performance Engineer
csswizardry
22
1.3k
Thoughts on Productivity
jonyablonski
69
4.5k
What’s in a name? Adding method to the madness
productmarketing
PRO
22
3.3k
Designing Experiences People Love
moore
139
23k
Building Flexible Design Systems
yeseniaperezcruz
328
38k
Producing Creativity
orderedlist
PRO
343
39k
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