GIT Workflow (Parte 1)

A. Matías Quezada219 Comments

Acabo de leer un artículo creado por los trabajadores de Github que han dado una vuelta de tuerca a lo que sabía de GIT y creo que será muy útil compartirlo, pero primero vamos por partes:

Control de Versiones

Prefiero empezar por lo más básico porque ésto es algo que los programadores damos por hecho pero para alguien empezando puede ser totalmente desconocido. Una de las herramientas más básicas de un programador junto con el editor de texto es un sistema de control de versiones. Se trata básicamente de un programa que registra los cambios que vamos haciendo en los archivos y cuando nosotros se lo ordenamos (hacemos commit) se guarda el estado actual de los archivos, si más adelante seguimos haciendo cambio en los archivos y en lugar de mejorar empeora gracias al sistema de control de versiones podemos revertir los archivos y dejarlos tal y como estaban en el último commit o cualquier commit anterior. Además permite que dos o más personas puedan archivos de un mismo proyecto y cuando ambos envíen sus cambios el sistema hará lo posible por combinarlos (hacer merge), en caso de que el merge no se pueda hacer automático el sistema notifica un conflicto de cambios y nos pide que lo hagamos a mano.

GIT

Después de usar SVN y TFS y SourceSafe en los cuales hacer merge era dramático o bien imposible (en SourceSafe dos personas no pueden modificar el mismo archivo a la vez), descubrir GIT fue fascinante, la eficacia con la que resuelve conflictos y la capacidad de crear, combinar y destruir ramas con un simple comando es una herramienta invaluable. El principal problema con las grandes herramientas es que hay tantas formas de usarlas que si no sabes lo que haces probablemente te encuentres en un caos y esa es la sensación que tuve al dar mis primeros pasos con GIT, estar gastando tiempo y esfuerzo en usar una herramienta compleja sin conseguir exprimirle el jugo.

GIT Flow

Finalmente me crucé con GIT Flow, una guía para aprovechar el potencial de GIT en el ámbito laboral. La idea es bastante sencilla pero las directrices deben ser respetadas para garantizar el orden:

  • Mantener en la rama master una versión del código lista para ser utilizada (production-ready)
  • Mantener en la rama develop las nuevas funcionalidades completas de nuestra aplicación, esperando a que podamos lanzar otra versión estable (release)
  • Las nuevas funcionalidades se desarrollan en ramas creadas a partir de la rama develop y una vez completadas se «mergean» a develop
  • Cuando develop esté listo para una nueva release se abre una rama y se hace la fase final de testing y los cambios de versión. Una vez completada ésta fase la rama de release se «mergea» a develop y master y se añade un tag en master para marcar la release.
  • Los bugs se arreglan en ramas creadas a partir de master y una vez corregidos igual que una rama de release se se actualiza la versión y se «mergea» a master y develop y se añade un tag en master

Para una explicación más detallada recomiendo leer el artículo original (inglés) ya que lo explica mucho mejor de lo que yo podría. Cada una de éstas operaciones está compuesta de varios comandos git que deben ser ejecutados en un orden dado y es muy común olvidar algún paso, principalmente al empezar con el Workflow, por ello disponemos de git-flow, una herramienta que añade comandos a git. Una vez instalado podremos ejecutar comandos como:

git flow feature start my-feature-name

Que gestionará por nosotros la creación de la rama a partir de develop. Podemos ver una introducción a git-flow en el artículo Why aren’t you using git-flow? (ingĺés). Aunque no sobra decir que en el caso de las interfaces gráficas de GIT hay que seguir los pasos manualmente.

Personalmente creo que éste sistema es bueno si tenemos GIT y no tenemos claro que Workflow seguir. Es un sistema muy extendido entre los usuarios de GIT lo que permite que la gente se adapte rápidamente y lo considero un punto medio entre complejidad y simpleza. Hay una variante para proyectos que necesitan mantener más de una versión (es decir, la mayoría de los productos que se venden como paquete cerrado) en ésta variante en lugar de poner un tag en master por versión creamos una nueva rama, por ejemplo «release-1.4», de ésta forma disponemos de distintas ramas para cada versión. Ésto nos permite corregir un bug en una versión pasada y sacar un parche específico.

El proceso al detectar un bug en la última release es probar las releases anteriores hasta detectar la release en la que se introdujo el bug. Por ejemplo, estamos en la versión 1.8 pero detectamos un bug que afecta a nuestro producto desde la versión 1.2. En ese caso corregimos el bug en una rama creada a partir de la rama de la primera versión que contiene el bug, y una vez corregido se envía a cada rama de release que contenga el bug. Evidentemente se trata de un Workflow mucho más costoso que no debe ser utilizado a menos que tengamos la necesidad de mantener más de una versión del producto que por mi experiencia considero una mala práctica, pero si nos encontramos en ésta situación nos puede reducir los problemas y ahorrar mucho tiempo. Continúa en la segunda parte…

219 thoughts on “GIT Workflow (Parte 1)”

  1. Appreciating the time and energy you put into your site and in depth information you present. It’s great to come across a blog every once in a while that isn’t the same old rehashed information. Wonderful read! I’ve bookmarked your site and I’m adding your RSS feeds to my Google account.

    Responder

  3. I was wondering if you ever thought of changing the structure of your blog? Its very well written; I love what youve got to say. But maybe you could a little more in the way of content so people could connect with it better. Youve got an awful lot of text for only having one or two images. Maybe you could space it out better?

    Responder

  4. I’m really loving the theme/design of your website. Do you ever run into any internet browser compatibility issues? A small number of my blog audience have complained about my site not operating correctly in Explorer but looks great in Safari. Do you have any advice to help fix this problem?

    Responder

  6. Have you ever considered creating an ebook or guest authoring on other sites? I have a blog based upon on the same information you discuss and would really like to have you share some stories/information. I know my audience would value your work. If you’re even remotely interested, feel free to shoot me an e-mail.

    Responder

  9. Greetings I am so delighted I found your blog page, I really found you by accident, while I was browsing on Google for something else, Nonetheless I am here now and would just like to say cheers for a incredible post and a all round exciting blog (I also love the theme/design), I don’t have time to read through it all at the moment but I have book-marked it and also added in your RSS feeds, so when I have time I will be back to read much more, Please do keep up the fantastic work.

    Responder

  11. What your declaring is absolutely true. I know that everyone need to say the similar factor, but I just feel that you set it in a way that everybody can comprehend. I also love the images you place in right here. They suit so well with what youre attempting to say. Im sure youll attain so quite a few folks with what youve received to say.

    Responder

  23. Today, I went to the beachfront with my children. I found a sea shell and gave it to my 4 year old daughter and said «You can hear the ocean if you put this to your ear.» She put the shell to her ear and screamed. There was a hermit crab inside and it pinched her ear. She never wants to go back! LoL I know this is completely off topic but I had to tell someone!

    Responder

  24. Woah! I’m really digging the template/theme of this blog. It’s simple, yet effective. A lot of times it’s very difficult to get that «perfect balance» between user friendliness and visual appeal. I must say that you’ve done a superb job with this. In addition, the blog loads extremely quick for me on Firefox. Superb Blog!

    Responder

  26. Hello would you mind letting me know which webhost you’re utilizing? I’ve loaded your blog in 3 different web browsers and I must say this blog loads a lot faster then most. Can you suggest a good internet hosting provider at a honest price? Thanks a lot, I appreciate it!

    Responder

  27. This design is incredible! You certainly know how to keep a reader entertained. Between your wit and your videos, I was almost moved to start my own blog (well, almost…HaHa!) Fantastic job. I really loved what you had to say, and more than that, how you presented it. Too cool!

    Responder

  28. Today, I went to the beachfront with my children. I found a sea shell and gave it to my 4 year old daughter and said «You can hear the ocean if you put this to your ear.» She put the shell to her ear and screamed. There was a hermit crab inside and it pinched her ear. She never wants to go back! LoL I know this is totally off topic but I had to tell someone!

    Responder

  39. Hello there! I know this is kinda off topic however I’d figured I’d ask. Would you be interested in trading links or maybe guest writing a blog article or vice-versa? My blog goes over a lot of the same topics as yours and I believe we could greatly benefit from each other. If you happen to be interested feel free to send me an e-mail. I look forward to hearing from you! Fantastic blog by the way!

    Responder

  40. Wonderful site you have here but I was curious about if you knew of any user discussion forums that cover the same topics discussed in this article? I’d really love to be a part of community where I can get comments from other knowledgeable people that share the same interest. If you have any recommendations, please let me know. Appreciate it!

    Responder

  41. Appreciating the hard work you put into your blog and detailed information you offer. It’s nice to come across a blog every once in a while that isn’t the same out of date rehashed material. Wonderful read! I’ve bookmarked your site and I’m including your RSS feeds to my Google account.

    Responder

  42. Hey just wanted to give you a quick heads up. The text in your post seem to be running off the screen in Chrome. I’m not sure if this is a format issue or something to do with web browser compatibility but I thought I’d post to let you know. The design and style look great though! Hope you get the problem fixed soon. Cheers

    Responder

  43. Have you ever considered about adding a little bit more than just your articles? I mean, what you say is important and all. Nevertheless think about if you added some great graphics or videos to give your posts more, «pop»! Your content is excellent but with images and videos, this blog could certainly be one of the most beneficial in its niche. Excellent blog!

    Responder

  44. Hey there would you mind stating which blog platform you’re using? I’m looking to start my own blog soon but I’m having a hard time deciding between BlogEngine/Wordpress/B2evolution and Drupal. The reason I ask is because your layout seems different then most blogs and I’m looking for something unique. P.S Apologies for getting off-topic but I had to ask!

    Responder

  46. I think this is among the most significant info for me. And i am glad reading your article. But want to remark on some general things, The web site style is wonderful, the articles is really excellent : D. Good job, cheers

    Responder

  49. * Учреждений всех видов работ
    – Все поставщики закупок за все года
    * Кто заказывал тендеры по 44 федеральному закону, 223 ФЗ
    – Авито, юла, и другие порталы с объявлениями
    * Резюме, индивидуальные данные специалистов
    · Данные людей
    * Контакты руководителей

    https://baseo.ru

    Responder

  51. Good day! I know this is kind of off topic but I was wondering which blog platform are you using for this website? I’m getting sick and tired of WordPress because I’ve had problems with hackers and I’m looking at alternatives for another platform. I would be awesome if you could point me in the direction of a good platform.

    Responder

  52. Hey there this is kind of of off topic but I was wondering if blogs use WYSIWYG editors or if you have to manually code with HTML. I’m starting a blog soon but have no coding knowledge so I wanted to get advice from someone with experience. Any help would be greatly appreciated!

    Responder

  53. Good day I am so excited I found your weblog, I really found you by accident, while I was browsing on Askjeeve for something else, Anyhow I am here now and would just like to say cheers for a marvelous post and a all round entertaining blog (I also love the theme/design), I don’t have time to read through it all at the moment but I have book-marked it and also included your RSS feeds, so when I have time I will be back to read a great deal more, Please do keep up the superb job.

    Responder

  54. Hi there! I could have sworn I’ve been to this website before but after reading through some of the post I realized it’s new to me. Nonetheless, I’m definitely delighted I found it and I’ll be bookmarking and checking back often!

    Responder

  55. Hi! I know this is somewhat off-topic but I had to ask. Does running a well-established blog such as yours require a massive amount work? I’m completely new to running a blog however I do write in my diary everyday. I’d like to start a blog so I can share my own experience and views online. Please let me know if you have any kind of suggestions or tips for new aspiring blog owners. Thankyou!

    Responder

  67. Thanks for a marvelous posting! I actually enjoyed reading it, you can be a great author.I will remember to bookmark your blog and will come back from now on. I want to encourage you to ultimately continue your great writing, have a nice morning!

    Responder

  69. Sweet blog! I found it while searching on Yahoo News. Do you have any suggestions on how to get listed in Yahoo News? I’ve been trying for a while but I never seem to get there! Appreciate it

    Responder

  70. Admiring the time and energy you put into your site and in depth information you offer. It’s nice to come across a blog every once in a while that isn’t the same outdated rehashed information. Fantastic read! I’ve bookmarked your site and I’m including your RSS feeds to my Google account.

    Responder

  77. I know this if off topic but I’m looking into starting my own weblog and was wondering what all is required to get setup? I’m assuming having a blog like yours would cost a pretty penny? I’m not very internet savvy so I’m not 100% certain. Any suggestions or advice would be greatly appreciated. Thanks

    Responder

  78. Hi this is kind of of off topic but I was wanting to know if blogs use WYSIWYG editors or if you have to manually code with HTML. I’m starting a blog soon but have no coding know-how so I wanted to get advice from someone with experience. Any help would be greatly appreciated!

    Responder

  79. First of all I would like to say excellent blog! I had a quick question that I’d like to ask if you do not mind. I was curious to find out how you center yourself and clear your thoughts prior to writing. I have had a difficult time clearing my thoughts in getting my thoughts out there. I truly do take pleasure in writing however it just seems like the first 10 to 15 minutes tend to be wasted simply just trying to figure out how to begin. Any recommendations or tips? Thank you!

    Responder

  80. Hi! This is my first comment here so I just wanted to give a quick shout out and say I genuinely enjoy reading your posts. Can you suggest any other blogs/websites/forums that go over the same topics? Thanks for your time!

    Responder

  82. Hi, i read your blog from time to time and i own a similar one and i was just curious if you get a lot of spam comments? If so how do you stop it, any plugin or anything you can advise? I get so much lately it’s driving me crazy so any support is very much appreciated.

    Responder

  83. Buy-book your plane tickets at low prices online. Profitable offer. Convenient search. Huge base of airlines and aircraft of any class. https://t.co/goA5t3H4ta

    We do not sell tickets, and help to find the cheapest. Is free.
    The largest search engine tickets. We compare all available flight options for your request, and then we direct you to buy on the official websites of airlines and agencies.
    The cost of the ticket you see is final. We have removed all hidden services and ticks.

    Where to fly? When are plane tickets cheaper? How to track the prices of air tickets?
    Choose the direction and dates with the cheapest flight on a map or a low price calendar, and in your account you will find contests and exclusive discounts from partners.

    Special offers airlines
    We know where to buy cheap flights. Airplane tickets to 220 countries.
    Search and compare airfares among 100 agencies and 728 airlines.

    Responder

  90. Does your website have a contact page? I’m having problems locating it but, I’d like to send you an e-mail. I’ve got some creative ideas for your blog you might be interested in hearing. Either way, great website and I look forward to seeing it grow over time.

    Responder

  92. Hey there would you mind letting me know which web host you’re using? I’ve loaded your blog in 3 different internet browsers and I must say this blog loads a lot quicker then most. Can you suggest a good web hosting provider at a reasonable price? Cheers, I appreciate it!

    Responder

  94. Fascinating blog! Is your theme custom made or did you download it from somewhere? A theme like yours with a few simple adjustements would really make my blog stand out. Please let me know where you got your theme. Cheers

    Responder

  98. I am 64 years old generally in Good health,Gymming daily for 40 mins. I am type 2 Diabetic,maintain a good diet etc. Since last year I am totally impotent and now Viagra also does not help much. I have been advised by one Doctor to use Testosterone Gel and HGH injection. The other doctor told me to go in for Testosterone injection . I am a bit confused and scared to try these options.
    So I would like the opinions of Good samaritans who have practical experience with any of the above treatment? Does someone try
    Cambridge HGH Therapy? Secondly what precautions and side effects I can expect from this line of action.
    Please serious advisors will be appreciated .
    Trollers are also welcome

    Responder

  107. Whats up this is somewhat of off topic but I was wanting to know if blogs use WYSIWYG editors or if you have to manually code with HTML. I’m starting a blog soon but have no coding skills so I wanted to get guidance from someone with experience. Any help would be enormously appreciated!

    Responder

  126. After checking out a number of the blog articles on your blog, I really appreciate your way of writing a blog.
    I added it to my bookmark site list and will be checking back soon. Please check out my web site too and tell me what you think.
    Phone Sex

    Responder

  164. Hello. Absolutely with you it agree. I like this idea, I completely with you agree.

    business scenario planning abortion pros and cons essay kids homework desks thinking critically by john chaffee equestrian business plan dna research paper i thought about this example of thesis statements for research paper example dissertation proposal goal essay essay transition capital punishment essays sample research paper thesis statement

    Responder

  211. Лучшие проститутки Питера, шлюхи и путаны Санкт-Петербурга
    Проститутки Питера это самое яркое воплощение сексуальности и женской красоты
    Ни для кого не секрет, что проститутки Питера это самое яркое воплощение женской красоты, сексуальности и раскрепощенности. Лучшие проститутки Питера способны свести с ума даже самых закоренелых семьянинов и верных мужей и подарить им те часы радости и сексуального наслаждения, которых они никогда не смогут получить от своих привычных партнеров, жен, подруг. Проститутки Питера позволят Вам воплотить в реальность все свои самые смелые и необычные фантазии, а сделают они это очень умело и профессионально. Питера проститутки в большинстве своем сами обожают секс и с радостью ставят всевозможные сексуальные эксперименты и пожалуй ни одна девушка не сможет сравниться в мастерстве с проверенными проститутками Питера. Ну разве Вы не мечтаете оказаться в объятиях обворожительной и нежной красотки? Рядом с которой Вы будете чувствовать себя настоящим мужчиной.

    Responder

  215. Представляем Вашему вниманию промышленные фрезерные станки с ЧПУ серий CNC-3030, CNC-4040 и CNC-6060. Промышленные фрезерные станки с ЧПУ данной серии предназначены для обработки дерева, пластмасс, органического стекла, акрила, камня, цветных металлов и даже стали. Управление промышленным фрезерным станком осуществляется системой числового программного управления. Промышленные фрезерные станки с ЧПУ по дереву и металлу нашего производства позволяют изготавливать художественные панно для отделки интерьеров и фасадов зданий, логотипы фирм, рекламную продукцию из дерева и металла.

    Производимые на нашем заводе промышленные фрезерные станки с ЧПУ по дереву и металлу применяются для небольших высокоточных изделий, ювелирных задач, восковок, печатных плат, 2D и 3D фрезеровки небольших изделий, металлических форм, шильдов, приборных панелей, штампов и электродов, сувениров и многого другого.

    Обращайтесь: https://stanki-chpu.ru/cnc-stanok/cnc304060-cena/

    Responder

Deja un comentario

Tu dirección de correo electrónico no será publicada. Los campos obligatorios están marcados con *