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
470
Chain made out of coins - smart introduction to blockchain
gwilczynski
0
100
WebComponents or shadow side of the Doom
gwilczynski
0
49
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
370
Other Decks in Programming
See All in Programming
overlayPreferenceValue で実現する ピュア SwiftUI な AdMob ネイティブ広告
uhucream
0
200
バッチ処理を「状態の記録」から「事実の記録」へ
panda728
PRO
0
180
「ちょっと古いから」って避けてた技術書、今だからこそ読もう
mottyzzz
11
7k
その面倒な作業、「Dart」にやらせませんか? Flutter開発者のための業務効率化
yordgenome03
1
140
One Enishi After Another
snoozer05
PRO
0
150
AI Agent 時代的開發者生存指南
eddie
4
2.1k
20251016_Rails News ~Rails 8.1の足音を聴く~
morimorihoge
2
670
Range on Rails ―「多重範囲型」という新たな選択肢が、複雑ロジックを劇的にシンプルにしたワケ
rizap_tech
0
6.7k
Introduce Hono CLI
yusukebe
6
3k
What's new in Spring Modulith?
olivergierke
1
160
Writing Better Go: Lessons from 10 Code Reviews
konradreiche
3
5.7k
EMこそClaude Codeでコード調査しよう
shibayu36
0
320
Featured
See All Featured
Measuring & Analyzing Core Web Vitals
bluesmoon
9
630
Unsuck your backbone
ammeep
671
58k
Designing for humans not robots
tammielis
254
26k
Bootstrapping a Software Product
garrettdimon
PRO
307
110k
Raft: Consensus for Rubyists
vanstee
140
7.2k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
333
22k
XXLCSS - How to scale CSS and keep your sanity
sugarenia
249
1.3M
Art, The Web, and Tiny UX
lynnandtonic
303
21k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
285
14k
Music & Morning Musume
bryan
46
6.9k
Scaling GitHub
holman
463
140k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
52
5.7k
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