-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathChapter 1.doc
39 lines (32 loc) · 1.15 KB
/
Chapter 1.doc
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
Chapter 1.
A. Gemset
1. Cach su dung gemset: rvm@name
2. Cach su dung 1 gemset default cho moi project: tao 1 file .rmvc o thu moc goc cua project go vao noi dung:
rvm use 1.9.3@gemsetName
3. rvm gemset list: de xem danh sach cac gem trong gemset
B. Git
I) How to init GIT & Simple case to commit and push code to origin/master
1. git init : de khoi tao git khi tao app
2. git add filename
3. git commit -m "commit mess"
4. git remote add origin
responsity_source([email protected]:huynhquocthai/demo_app.git)
5. git push origin master
II. Test conflict
1. git init : de khoi tao git khi tao app
2. git remote add origin responsity_source
III. eeeee
3. git add filename
4. git commit -m "commit mess"
5. git push origin master
IV. Xu ly conflict
1. git fetch: fetch code ve may
2. git rebase origin/master: update version code o local = version code o origin:
a. Bi conflict code:
+ git status: xem nhung file nao bi conflict
+ Xu ly conflict code tren tung file mot
+ git add tung file conflict
+ git rebase --continue
+ gitk --all
+ git push origin master
git status: show status of all changes