NOTE 9/19/2019: This video is now over 7 years old. I've abandoned many of the ideas and do things differently now. The video is still useful – AS IT WAS ORIGINALLY INTENDED – to give an example of how one COULD do things, not as a mandatory process. Since I now get away from my computer whenever I can and ride my bike instead, I probably won't make an updated video. Thanks for all the comments and interactions over the years! I never thought I'd have 200k views when I made this in 2012. It was fun. I probably won't respond to comments as quickly as I did in previous years, mostly because after nearly 30 years of programming, I don't spend much time outside of work hours thinking about these things anymore. Take care!

PLEASE READ: This video shows an EXAMPLE of Git branching and merging strategies. It's a good template to get you started in different situations. It's not a /"HOW YOU SHOULD DO IT/" video. These are ideas based on my experience. Hopefully they will improve your understanding of Git. By the end, you should have your own process of UNDERSTANDING how Git works and then developing a branching and merging strategy that works for YOU and your situation.

—-

Three similar branching and merging strategies in Git with the common goal of keeping the development history linear.

PowerPoint: http://goo.gl/kQPwb

NOTE 1: This example branching and merging strategy is intended for larger development teams that manage a formalized development cycle with distinct development, testing, and release phases and require production maintenance of more than just the latest product version. I do not recommend these considerations for small teams and simple development processes.

NOTE 2: Remember that my advice is simply examples I've gathered from my experience. If you don't know where to start, the specific processes I've laid out are a good place to start, but be sure to adapt them to your specific needs or preferences as you become more comfortable with things.

NOTE 3: Note 2 implies that you take the time to understand what I have laid out, not just imitate it, and that you are also clear about what your development process requires.

Please take the opportunity to connect with your friends and family and share this video with them if you find it useful.