Your SlideShare is downloading. ×
0
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
A [git] workflow
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×
Saving this for later? Get the SlideShare app to save on your phone or tablet. Read anywhere, anytime – even offline.
Text the download link to your phone
Standard text messaging rates apply

A [git] workflow

4,051

Published on

Charla de Enero 2011 en Madrid-rb …

Charla de Enero 2011 en Madrid-rb

https://madridrb.jottit.com/enero_2011

Published in: Technology
1 Comment
11 Likes
Statistics
Notes
No Downloads
Views
Total Views
4,051
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
66
Comments
1
Likes
11
Embeds 0
No embeds

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide

Transcript

  • 1. A [git] workflow Continuous Delivery that doesnt hurtmadrid-rb Sergio Gil@madridrb @porras
  • 2. DISCLAIMER IEsto va más de workflow que de git. Aceptamos mercurial como animal de compañía
  • 3. DISCLAIMER II + RETOIntentar no citar explicitamente un comando de git en toda la charla
  • 4. http://gitimmersion.com/
  • 5. yo / nosotros
  • 6. Hacemos productos
  • 7. Hacemos productosy los productos duran para siempre
  • 8. Nuestros productos son complejos
  • 9. Nuestros productos son complejos Nos encanta el TDD
  • 10. Nuestros productos son complejos Nos encanta el TDDNos encanta el feedback temprano
  • 11. Nuestros productos son complejos Nos encanta el TDD Nos encanta el feedback tempranoSiempre probamos en un entorno de staging
  • 12. “Máquina deconvertir café en código”
  • 13. “Máquina deconvertir café hamburguesas en código”
  • 14. “Máquina deconvertir café hamburguesas en código” features
  • 15. “Máquina deconvertir café hamburguesas en código” features útiles
  • 16. “Máquina deconvertir café hamburguesas en código” features útiles en producción
  • 17. “Máquina de convertir café hamburguesas en código” features útiles en producciónidea implícita: tiempo
  • 18. U Feature A en una semana Feature A en un mes T
  • 19. h oy eA ur atFe es m 1 en eA tur Fea
  • 20. Feature A hoy
  • 21. Feature A Feature A + B hoy en un mes
  • 22. Feature A Feature A + B Feature A hoy + hoy en un mes Feature B en un mes
  • 23. KANBAN
  • 24. WIP (≤ X)
  • 25. master
  • 26. master Feature A Task 1/3
  • 27. master Feature A Task 1/3 Feature B Task 1/2
  • 28. master Feature A Task 1/3 Feature B Task 1/2 Feature A Task 2/3
  • 29. master Feature A Task 1/3 Feature B Task 1/2 Feature A Task 2/3 Feature B Task 2/2
  • 30. master Feature A Task 1/3 Feature B Task 1/2 Feature A Task 2/3 Feature B Task 2/2 B ya está, ¡a desplegar!
  • 31. master Feature A Task 1/3 Feature B Task 1/2 Feature A Task 2/3 Feature B Task 2/2 B ya está, ¡a desplegar! ¡NEGATIVO, Señor! A no está lista
  • 32. Problema del despliegue retrasado que retrasa el despliegue
  • 33. Problema del despliegue retrasado que retrasa el despliegue o
  • 34. Problema del despliegue retrasado que retrasa el despliegue o Espiral de mierda
  • 35. Problema del despliegue retrasado que retrasa el despliegue o Espiral de mierdaSi mientras esperamos que A esté lista empezamos C, ¡el problema puede durar para siempre!
  • 36. ¡OK, usemos ramas!
  • 37. master
  • 38. master feat_a
  • 39. masterfeat_b feat_a
  • 40. masterfeat_b feat_a
  • 41. masterfeat_b feat_a
  • 42. masterfeat_b feat_a ➜ staging
  • 43. masterfeat_b feat_a ➜ staging OK
  • 44. masterfeat_b feat_a ➜ staging OK ➜ producción
  • 45. masterfeat_b feat_a ➜ staging OK ➜ producción
  • 46. masterfeat_b feat_a ➜ staging OK ➜ producción
  • 47. masterfeat_b feat_a ➜ staging OK ➜ producción ➜ staging
  • 48. masterfeat_b feat_a ➜ staging OK ➜ producción ➜ staging OK
  • 49. masterfeat_b feat_a ➜ staging OK ➜ producción ➜ staging OK ➜ producción
  • 50. master
  • 51. master feat_a
  • 52. masterfeat_b feat_a
  • 53. masterfeat_b feat_a
  • 54. masterfeat_b feat_a
  • 55. masterfeat_b feat_a ➜ staging
  • 56. masterfeat_b feat_a ➜ staging FAIL
  • 57. masterfeat_b feat_a ➜ staging FAIL
  • 58. masterfeat_b feat_a ➜ staging FAIL
  • 59. masterfeat_b feat_a ➜ staging FAIL
  • 60. masterfeat_b feat_a ➜ staging FAIL ➜ staging
  • 61. masterfeat_b feat_a ➜ staging FAIL ➜ staging OK
  • 62. masterfeat_b feat_a ➜ staging FAIL ➜ staging OK ➜ producción
  • 63. masterfeat_b feat_a ➜ staging FAIL ➜ staging OK ➜ producción ¡NO!
  • 64. masterfeat_b feat_a ➜ staging FAIL ➜ staging OK ➜ producción ¡NO! la feature A está rota
  • 65. master stable
  • 66. master stable feat_a
  • 67. master stable feat_b feat_a
  • 68. master stable feat_b feat_a
  • 69. master stable feat_b feat_a
  • 70. master stable feat_b feat_a➜ staging
  • 71. master stable feat_b feat_aFAIL ➜ staging
  • 72. master stable feat_b feat_aFAIL ➜ staging
  • 73. master stable feat_b feat_aFAIL ➜ staging
  • 74. master stable feat_b feat_aFAIL ➜ staging ➜ staging
  • 75. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging
  • 76. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging
  • 77. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging cc ión u prod ➜
  • 78. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging feat_c ión ucc p rod ➜
  • 79. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging feat_c ión ucc p rod ➜
  • 80. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging feat_c ión ucc p rod ➜
  • 81. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging feat_c ión ucc ➜ staging p rod ➜
  • 82. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging feat_c ión uccOK ➜ staging p rod ➜
  • 83. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging feat_c ión uccOK ➜ staging p rod ➜
  • 84. master stable feat_b feat_aFAIL ➜ stagingOK ➜ staging feat_c ión uccOK ➜ staging p rod ➜ ➜ producción
  • 85. BONUS POINTS & PRO TIPS
  • 86. BONUS POINTS & PRO TIPSrecuerda publicar topic branches
  • 87. BONUS POINTS & PRO TIPSrecuerda publicar topic branches taguea tus releases
  • 88. BONUS POINTS & PRO TIPS recuerda publicar topic branches taguea tus releasesrebasa tus ramas privadas sobre stable
  • 89. BONUS POINTS & PRO TIPS recuerda publicar topic branches taguea tus releases rebasa tus ramas privadas sobre stablenunca rebases o enmiendes commits publicados
  • 90. BONUS POINTS & PRO TIPS recuerda publicar topic branches taguea tus releases rebasa tus ramas privadas sobre stablenunca rebases o enmiendes commits publicados --no-ff para una historia detallada
  • 91. BONUS POINTS & PRO TIPS recuerda publicar topic branches taguea tus releases rebasa tus ramas privadas sobre stablenunca rebases o enmiendes commits publicados --no-ff para una historia detallada reset: corte por donde tenga que cortar
  • 92. PROBLEMAS
  • 93. PROBLEMASA veces la integración da trabajo
  • 94. PROBLEMAS A veces la integración da trabajoEscala mal tanto en horizontal como en vertical
  • 95. PROBLEMAS A veces la integración da trabajoEscala mal tanto en horizontal como en vertical WIN
  • 96. graciasmadrid-rb Sergio Gil@madridrb @porras

×