Git for Newbies. ComMouse Dongyue Studio

Size: px

Start display at page:

Download "Git for Newbies. ComMouse Dongyue Studio"

Andra Charles
5 years ago
Views:

1 Git for Newbies ComMouse Dongyue Studio

2 Contents What is Git? Git Quick Start Git Branch Git Workflow Git in Practice

3 What is Git?

4 What is Git? A Version Control System (VCS) An Open-sourced Version Control System An Open-sourced Distributed Version Control System Initially created by Linus Torvalds Driven by Linux development An alternative to BitKeeper

5 Version Control System Git Subversion (SVN) Perforce QQ/Wechat/ (Maybe?) Or by yourself: mycode cpp myproject zip mydoc-v6.docx

6 Git Highlights Distributed repository Everyone has a full copy of the repository Command line interface Powerful branch support Commit based design Not initially designed for large binary files

7 Git Quick Start

8 Install Git Windows Download & Install Git for Windows choco install git (if Chocolatey installed) Linux apt-get/yum install git Mac OS X Bundled with Xcode by default brew install git (if Homebrew installed)

9 Hello World Open your CLI Git Bash (Windows) Terminal Type in the following commands $ git init $ echo Hello world > README $ git add README $ git commit -m "First commit"

10 Basic Concepts git checkout <identifier> * Working Directory git add git reset HEAD Staging Area git commit git reset HEAD~ Commits (Git Repository) Physical files in your directory Files temporarily staged by Git Certain version of files permanently stored * A commit can be identified by its SHA1 hash code, branch, tag, etc.

11 Remote Synchronization Git may sync with remote repositories In practice, we use Git hosting services as remote repositories Example Add origin link $ git remote add origin or (with SSH key configured) $ git remote add origin git@github.com:commouse/learn-git.git Push to origin $ git push u origin master Pull from origin $ git pull

12 Remote Synchronization $ git push origin master Counting objects: 5, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (5/5), 384 bytes KiB/s, done. Total 5 (delta 0), reused 0 (delta 0) To * [new branch] master -> master

13 Conflict Resolution Oops! Alice and you have edited the same file! Auto-merging test.cpp CONFLICT (add/add): Merge conflict in test.cpp Automatic merge failed; fix conflicts and then commit the result. Git allows you to solve conflicts when pulling by yourself HOWTO Open the conflict file with a code editor Search for <<<, ===, >>>, which wrap your change and Alice s change Manually change to the correct version and remove unnecessary areas Run git add and git commit to add a new merge commit containing your resolutions

14 Git Hosting Services GitHub GitLab BitBucket Coding.net Gitee

15 Git Branch

16 Branch Tree Back to our conflict example :( Before pulling origin/master You Alice dd771abe Revise a.cpp (Alice) master; HEAD e9a728f6 Add a.cpp c87a7ba Revise a.cpp

17 Branch Tree Back to our conflict example :( After pulling and merging origin/master You Alice dd771abe Revise a.cpp (Alice) master; HEAD e9a728f6 c87a7ba a194cdef Add a.cpp Revise a.cpp Merge commit

18 Branch Tree Back to our conflict example :( After rebasing (git rebase origin/master) What happened? origin/master dd771abe You Alice Revise a.cpp (Alice) master; HEAD e9a728f6 Add a.cpp c87a7ba Revise a.cpp a842923e Revise a.cpp

19 Branch Tree Back to our conflict example :( After rebasing (git rebase origin/master) What happened? origin/master dd771abe You Alice Revise a.cpp (Alice) e9a728f6 Add a.cpp master c87a7ba Revise a.cpp detached HEAD???

20 Detached HEAD The HEAD pointer not points to any branch Use git reset -hard or git checkout to change HEAD What about your old commit? Will be removed by GC Where to view your git tree? git log --graph GUI tools or Web interface

21 Git Pull? Not the best way to handle branches In our example git pull = git fetch origin && git merge origin/master vs git fetch origin && git rebase origin/master

22 Interactive Rebase Actually, git rebase can do more. $ git rebase -i <from> <to> Switch commit order Remove commit Revise commit message Squash multiple commits

23 Further Discussion Git Documentation Pro Git

24 Git Workflow

25 Branching Workflow master; develop; feature

26 GitHub Workflow Fork the repo (and star!) Commit changes Create one pull request Merge into the original repo

27 Git in Practice

28 Git in Practice CRLF Problem Ignore irrevelant files Protect the.git directory Git Hooks

29 Git GUI Tools SourceTree GitHub Desktop SmartGit

30 Thank You

GETTING STARTED WITH. Michael Lessard Senior Solutions Architect June 2017

GETTING STARTED WITH. Michael Lessard Senior Solutions Architect June 2017 GETTING STARTED WITH Michael Lessard Senior Solutions Architect June 2017 Agenda What is Git? Installation of Git Git basis Github First steps with Git 2 WHAT IS GIT? What is Git? Started in 2005 Created