Monday
Sep292008
Git: Branching and Fast-forward Merging
Monday, September 29, 2008 at 10:18AM
I made these videos late last night, mostly on a whim and to see if people found them useful. I've been digging deeply into Git over the past couple of weeks and, if I do anything well, I think one thing I make a decent job of is to go deep on a subject and then blog about it.
I learn in a very top-down way - I'm not initially detail-oriented. First I want to know the big picture, the overarching ideas and the big levers that you pull with all your might. I prefer to understand the screws and springs after I've grasped the big things. These are the result of my screws-and-springs research.
Disclaimer: I'm still a relative git newbie, although I have been using it for serious work since March, so you should verify what I say before going to town on your repositories. Also, I am doing my best to 'umm' and 'aah' less on these :-)
Branching
This video explains the interaction between commits, branches and branch heads.
Fast-forward Merging
This video graphically explains what the git "fast-forward merge" feature does. This is a special-case operation in which you branch off a commit, work only on the new branch and then merge back. Compare this video to the one above in which
This video contains a slight error around the 2:00 mark that is noted in the Viddler timeline.
I would appreciate feedback on whether you find these useful.
I learn in a very top-down way - I'm not initially detail-oriented. First I want to know the big picture, the overarching ideas and the big levers that you pull with all your might. I prefer to understand the screws and springs after I've grasped the big things. These are the result of my screws-and-springs research.
Disclaimer: I'm still a relative git newbie, although I have been using it for serious work since March, so you should verify what I say before going to town on your repositories. Also, I am doing my best to 'umm' and 'aah' less on these :-)
Branching
This video explains the interaction between commits, branches and branch heads.
Fast-forward Merging
This video graphically explains what the git "fast-forward merge" feature does. This is a special-case operation in which you branch off a commit, work only on the new branch and then merge back. Compare this video to the one above in which
NewFeature was branched and work continued in parallel on both master and NewFeature.This video contains a slight error around the 2:00 mark that is noted in the Viddler timeline.
I would appreciate feedback on whether you find these useful.
Reader Comments (51)
Hi Fraser,
thank you very much for this short video tutorials. I always find it more useful to actually see how something is working or has to be done than reading it.
Greetings and keep up the good work.
Great work, Fraser. I've been toying with the idea of moving to a DVCS. Your blog posts and Twitter stream have been interesting to follow as you work through learning git. Please do keep sharing!
Hey Fraser, thanks these are fab, keep going please :-) I've been 'just getting by' with the bare minimum of git commands since March, when I started to volunteer some time to the Sugar/OLPC projects (they use git for all their source control). Watching these videos makes git less scary (git seems to have just so many, very slightly different, commands).
Thanks Fraser, very useful indeed!
That was most helpful, and worked as depicted. Now just get your GUI git tool out with those kind of visualisations...
Thank you very much. Its really nice learn how 'git merge' works.
This is a really good way to explain fast-forward and merge, i mean the video, thoug the voice volume is really low.
Thank you very much.
Very nice and clear. May I ask what tool you used to create the diagrams -- was it OmniGraffle? I just watched your rebase video and I'm wondering how you got that effect where you hover over a shape and it highlights in red.
fake rolex watches
rolex fake
rolex replica watches
rolex watches
replica watches paypal
fake rolex
replica rolex watches
rolex replicas
replica rolex
replica watches
omega watches
fake omega watches
omega replica watches
breitling replica watches
fake breitling watches
fake tag watches
tag heuer watches
tag heuer
replica chanel watches
chanel j12 watches
replica watches paypal
replica watch paypal
replica rolex paypal
rolex replica paypal
yes ,i agree with you ,but i want to say that ,we are young people ,we love freash things ,so i hope you can refersh you arctile usually ,thank you.by the way do you know about
cheap dvds
and Tiffany Jewelry
Very nice site and article. Amazing one, i appreciate this work.... This is a wonderful post
Assignment |
Coursework |
oh my!! i love you so much!!
Thank you so much.
Louis Vuitton Handbag
Very very understandable!
Thank you!
Doing the right things than doing things right important jordan retro shoes for sale. Perfection of human character is the mean to the end of human wealth jordan shoes on sale. The establishment of life. http://www.jordanshoesonsales.com/
oh my!! i love you so much!!
Thank you so much.
Speedy
http://www.speedy-bags.tk
Speedy
Mulberry Outlet Store is a top brand in the UK. Our Mulberry bags offers all kinds of mulberry sale with unique design and fashion style. What's more, the Mulberry Bags are on sale now, you can find any latest design that you are looking for here, and get them at the best price.
Come here, you will find a best mulberry factory shop. mulberry handbags is one key point of our Mulberry outlet shop. Discount Mulberry sales are on at the moment.
We are a professional online ghd planchas store has a supply of high quality low price professional GHD.ghd planchas de pelo All of our services, you get a keen sense of observation and security.And our staff is ghd australia ready need.It was nine years ago that one of these miracle products currently lives with his name and date of the structure had good hair. " Many even recommend to my friends GHD,ghd australia and they together on this issue so that it works when they discover, to connect the hair of fitness. The cost of this hardware can be much higher than in many other makes and models, but for many women it is a worthwhile investment.
Beautiful hair bring you good mood all day! If you want to buy a ghd hair straighener australia, I recommend you go to online store, for there have a lot of lisseur ghd! ALL of them are easy and simple to handle. Besides, it allows you to enjoy the beautiful!Our company will constantly update the new products, styles to better meet people's appreciation and providing a better marketing system.it the lustrous and frizz zero cost results you can actually accomplish with GHD hair straightener you'll be fascinated in the longevity to your hair stylers.Pull and additionally turn the actual straightener slowly and gradually to generate a stretched corkscrew for instance curl. For even bigger bouncy curls, support the ghd australia lat on your head along with twist and pull a little bit faster for a looser curl.all kinds of GHD hair straighteners can be chosen here.You can change your hair style arbitrary now. Our ghd hair straightener are the youth, fashion and personalization options! Super surprise waiting for you!
Your blog posts and Twitter stream have been interesting to follow as you work through learning git.
club penguin cheats
Prior to the stroke path, you can improve your skills and warm-up, which Donegal on the best practice facilities in the north-west of Ireland.golf clubs You'll find items such as driving a clean, green with bunkers, chipping, golf course, driving range with automatic ball dispenser and there is even par 3 Junior course. Donegal Golf Club Pro also too ready to offer courses for beginners and novices. The conquest of this course is one thing, but at the end of the day, you can enjoy the occasion,ゴルフ the club facilities and just relax and enjoy the day's events. You can go directly to the cabin and equipment cool with a high-care and excellent service. Visitors lockers and showers are first class. After recovery,ping golf clubs you can go to a restaurant aboard the magnificent Irish cuisine. Or if you prefer, you can have your friends a round of golf with you some of the residents to meet in a bar drinking a few glasses. Keep your memories of your holiday in Donegal Golf integrated with some clothing logo of the club shop.
Looking for an advanced amateur photo club – Ive reasearched online and found one in Palo Alto and San Rafael, each location about an hour or so away from me….anyone know of any in say, San Francisco or the East Bay? If not, anyone interested in joining one?
timberland boots as a footwear brand that is respected globally for its exceptional outdoor, rugged traditional timberland boots, timberland boots for men have always remained one step ahead of many of their competitors, ever since they introduced the first waterproof boot in 1973. Their Spring collection continues these innovations with a twist to their footwear that makes this new collection of boots even more water-resistant and hard-wearing than any of its predecessors.
Always wanting to maintain their brand philosophy, timberland boots introduce this new stylish collection of boots with pride; as they retain the brands environmental attitude as well as continuing to provide their customers with boots of practicality and traditional style.
timberland boots as a footwear brand that is respected globally for its exceptional outdoor, rugged traditional timberland boots, timberland boots for men have always remained one step ahead of many of their competitors, ever since they introduced the first waterproof boot in 1973. Their Spring collection continues these innovations with a twist to their footwear that makes this new collection of boots even more water-resistant and hard-wearing than any of its predecessors.
Always wanting to maintain their brand philosophy, timberland boots introduce this new stylish collection of boots with pride; as they retain the brands environmental attitude as well as continuing to provide their customers with boots of practicality and traditional style.
They found no proof that life exists now or that it existed in the past.
A great post but How to select a cool handbags. we sell cheap handbags We are the best store provided various cheap designer handbags but only a little white to make coach handbags online