36. 基礎概念
36
s tIworking directory staging area repository
ytremote repository
s tIworking directory staging area repository
ssh 連線
public key 認證
37. remote Repo service
• Cooperate with others, private used or open source
• Issue tracking, Wiki feature
• Over 5 people in a private repo will charge
• In this course, we use github and open source
39. set up ssh key with gitgub
39
Reference: https://help.github.com/articles/generating-ssh-keys
40. $ cd ~/.ssh
$ ls -al
# Lists the files in your .ssh directory
40
Step 1: Check for SSH keys
檢查你有沒有 id_rsa.pub or id_dsa.pub
41. $ ssh-keygen -t rsa -C "your_email@example.com"
# Creates a new ssh key, using the provided
email as a label
41
Step 2: Generate a new SSH key
生成新的 ssh key,在你的 ~/.ssh/ 目錄底下
62. $ git log
commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
Author: Scott Chacon <schacon@gee-mail.com>
Date: Sat Mar 15 16:40:33 2008 -0700
!
removed unnecessary test code
!
commit a11bef06a3f659402fe7563abf99ad00de2209e6
Author: Scott Chacon <schacon@gee-mail.com>
Date: Sat Mar 15 10:31:28 2008 -0700
!
first commit
$ git checkout a11bef0
62
checkout to past commit
67. $ git status
On branch master
You have unmerged paths.
(fix conflicts and run "git commit")
!
Unmerged paths:
(use "git add <file>..." to mark resolution)
!
both modified: index.html
67
conflict
68. <<<<<<< HEAD
<div id="footer">contact :
email.support@github.com</div>
=======
<div id="footer">
please contact us at
support@github.com
</div>
>>>>>>> bugFix
68
衝突的地⽅方會標⽰示出來