git. even more basic (for business people)
DESCRIPTION
this slide is for a lecture, teaching business people to managing their html, image source code by Git.TRANSCRIPT
![Page 1: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/1.jpg)
Ver.2 for teamsite management
Nguyen Minh Tuan @FSS
![Page 2: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/2.jpg)
File management
Git solution
Install & try
Workflow
![Page 3: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/3.jpg)
File management
Git solution
Install & try
Workflow
![Page 4: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/4.jpg)
How are you
Managing your files
![Page 5: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/5.jpg)
Folder based File management?
![Page 6: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/6.jpg)
![Page 7: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/7.jpg)
Newest?
Where was changed?
Rollback?
![Page 8: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/8.jpg)
![Page 9: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/9.jpg)
I modified file A and upped to server, please download
DON’T TOUCH! I am modifying it
We want to release. Send us the newest, and stop your service!
This version has problem. Please undo Mr. A, Ms. B, Ms. C’s modification ASAP
Where did you change? Please mark it, or note some where
![Page 10: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/10.jpg)
Version control
![Page 11: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/11.jpg)
File management
Git solution
Install & try
Workflow
![Page 12: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/12.jpg)
Take snapshots of files in every version (commit)
![Page 13: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/13.jpg)
5W1H info in every version (commit)
Commit #4 (newest)
Commit #1 (oldest) Commit #2 Commit #3
Who created this commit (author)
What was modified (files)
Where was modified (detail)
When was this modification made (time)
Why does this modification need (message)
How is it related to other commits (parents)
![Page 14: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/14.jpg)
![Page 15: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/15.jpg)
1 2 3 4
Get Get Have
Can Revert to any previous version
![Page 16: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/16.jpg)
How it works?
remote repo
A
![Page 17: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/17.jpg)
How it works?
Local repo 1
A
remote repo
A
clone
![Page 18: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/18.jpg)
How it works?
Local repo 1
A
A’ Modify A => A’
remote repo
A
![Page 19: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/19.jpg)
How it works?
Local repo 1
A’
A’ Modify A => A’
Commit
remote repo
A
![Page 20: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/20.jpg)
How it works?
Local repo 1
A’
A’ Modify A => A’
Commit
remote repo
A
![Page 21: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/21.jpg)
How it works?
Local repo 1
A’
A’ Modify A => A’
Commit
remote repo
Push
A’
![Page 22: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/22.jpg)
How it works?
Local repo 1
A’
A’ Modify A => A’
Commit
remote repo
Push
Local repo 2
A
A’
![Page 23: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/23.jpg)
How it works?
Local repo 1
A’
A’ Modify A => A’
Commit
remote repo
Push
Local repo 2
Pull
A’
A’
![Page 24: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/24.jpg)
How it works?
Everyone with permission from everywhere can get the newest version and modify history of that files whenever they need
![Page 25: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/25.jpg)
File management
Git solution
Install & try
Workflow
![Page 26: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/26.jpg)
Tools
Black console Can do everything Need to remember commands I rarely use it.
SourceTree A GUI client for GIT Don’t need to remember commands Easy to use, confirm modifications
![Page 27: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/27.jpg)
Install
http://www.sourcetreeapp.com/
![Page 28: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/28.jpg)
https://git.dev.rakuten.com/projects/LOTT/repos/teamsite/browse
![Page 29: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/29.jpg)
Change local directory (where you want to save to) if need
![Page 30: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/30.jpg)
After clone
![Page 31: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/31.jpg)
Add/ modify something (add file 1)
![Page 32: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/32.jpg)
Move modified files from “working” to “staged”
Click “Commit”
![Page 33: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/33.jpg)
add your comment ( what did you change, why, where, etc )
![Page 34: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/34.jpg)
Select your branches (master) to confirm the change
(push) to update to server
![Page 35: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/35.jpg)
Select your branches (master) to confirm the change
(push) to update to server
![Page 36: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/36.jpg)
Start a new modification?
1. Click (pull) to get latest version
2. Confirm source and (OK)
![Page 37: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/37.jpg)
Confirm the difference (if required)
![Page 38: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/38.jpg)
Start modification, test & save
![Page 39: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/39.jpg)
Confirm modification (if required)
![Page 40: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/40.jpg)
Lines added + some contents
Lines removed + some contents
No change some contents
Confirm modification => commit & push
![Page 41: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/41.jpg)
File management
Git solution
Install & try
Workflow
![Page 42: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/42.jpg)
clone modify
Add to stage
commit
pull
push
pull Get the latest source code
Add modification
Select what to update to server
Decide what to update with some note
Confirm again if there is any change?
Update to server
1 time
start
end
![Page 43: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/43.jpg)
Trouble?
clone modify
Add to stage
commit
pull
push
pull
1 time
start
end
Conflict
Other people modified the same file and push to server after your last pull
![Page 44: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/44.jpg)
![Page 45: Git. EVEN more basic (for business people)](https://reader034.vdocuments.us/reader034/viewer/2022052601/558de5791a28abe2428b46da/html5/thumbnails/45.jpg)
Modify (resolve conflict) and add to stage again