Skip to content

Instantly share code, notes, and snippets.

@anonoz
Last active August 29, 2015 13:57
Show Gist options
  • Save anonoz/9708117 to your computer and use it in GitHub Desktop.
Save anonoz/9708117 to your computer and use it in GitHub Desktop.
# Git: Because it's time to learn how to team code like the pros
## Contents
1. Why learn git - The Programmers' Dropbox Dilemma
2. Getting started - Download and setup git
3. Sample project and scenario - A sample website, 3 programmers in a team
4. git init, add, commit - Your first commit
5. git status, diff, log - Second commit
6. git checkout, branch, merge, rebase - Let's get experimental
7. GitHub - Social Coding Platform
8. git remote, push, pull, fetch - Let's code together
9. SourceTree - if you don't like command line
## Why learn git - Dropbox Dilemma
- Programmers need to collaborate on a software project, but none of modern day tools offer very good way to allow collaboration efficiently.
- Although Dropbox significantly improve the efficiency when it comes to file sharing, for coding however it's still not suitable.
- For example, when two programmers open the same file and start to code at the same time, and programmer A saves the file earlier than programmer B, there will be conflict and the work of programmer A will be wiped out.
- So Dropbox has couple of issues: Concurrency and conflict resolution
- Concurrency - No two programmers can work together at the same time effectively
- Conflict Resolution - The second change will wipe the first one out
- Git solves that, think Git as a time machine and parallel universes for your projects.
- We will explain this in later chapters.
## Getting Started
-
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment