4 ms·
Same! Sometimes I would like to introduce my coworkers to the amazing world of git, but it's hard to convince them without showing them a concrete example, this
by tiziano88 14y ago
Same! Sometimes I would like to introduce my coworkers to the amazing world of git, but it's hard to convince them without showing them a concrete example, this one is a pretty nice overview, and also useful for advanced users! I just got a better, more intuitive understanding of what detached HEAD really means thanks to it!
- msoad 14y agoGit is amazing, I just wish if there was a better conflict resolving approach in Git.
- alinajaf 14y agoDo you really? I like the fact that git doesn't try anything clever when it hits a conflict and asks you to fix by hand. Have you found an automatic conflict resolution tool that you liked before?
- _ikke_ 14y agoresolving conflicts is not something machines can do. There needs to be a human to decide what is a correct outcome.
- xxbondsxx 14y agoNo problem, really glad you like it. I think one of the most important distinctions as well is the difference between rebasing and merging -- I show this off in the demo link: http://pcottle.github.com/learnGitBranching/index.html?demo http://pcottle.github.com/learnGitBranching/index.html?demo I never understood why some repos only accept rebase commits until I actually looked up how the graph is wildly different depending on the command