title: The most awesome git intro ever link: https://onemoretech.wordpress.com/2014/06/11/the-most-awesome-git-intro-ever/ author: phil2nc description: post_id: 7858 created: 2014/06/11 21:46:07 created_gmt: 2014/06/12 01:46:07 comment_status: closed post_name: the-most-awesome-git-intro-ever status: publish post_type: post

The most awesome git intro ever

Jessica Kerr, Git Happens. Embed and a few words below. "Finally I have the context needed to understand all those git tutorials on the Internet!" -- Eldapo This is a really thorough, high level view of how git works AND how you should work with git. It provides the big picture that's missing from the documentation and every tutorial I've read before. Should be required viewing for everyone who uses or supports git. [youtube https://www.youtube.com/watch?v=yCh6TSLIQBQ&w=560&h=315] Jessica's slides can be found here. Here's a page with additional supporting material and a link to an earlier version of the talk that uses a whiteboard instead of a slide deck. Most important tip I got from this video? "Pull is bad. Pull does a fetch and an automatic merge. To get other people's changes, use git fetch!" Second most important? If you get a merge conflict do not take a break! Either resolve the conflict or do a "git merge abort" to roll it back until you can. Jessica also recommends using one of the many available graphical tools to keep checking what the commit tree looks like. The longer I use git, the more I find myself agreeing with her. If you're on a Mac, gitx is supposed to be good. I personally use gitg on Linux and git-extensions on Windows. There are so many others like these. Too many to mention here. Watch the video. Then watch it again. You'll be happy you did.

Copyright 2004-2019 Phil Lembo