Ver.2 for teamsite management
Nguyen Minh Tuan @FSS
File management
Git solution
Install & try
Workflow
File management
Git solution
Install & try
Workflow
How are you
Managing
your files
Folder based
File management?
Newest?
Where was changed?
Rollback?
I modified file A and upped to
server, please download
DON’T TOUCH! I am
modifying it
We want to release. Send us the
newe...
Version control
File management
Git solution
Install & try
Workflow
Take snapshots of files in
every version (commit)
5W1H info in every version (commit)
Commit #4
(newest)
Commit #1
(oldest) Commit #2 Commit #3
Who created this commit (aut...
1 2 3 4
Get Get Have
Can Revert
to any previous version
How it works?
remote repo
A
How it works?
Local repo 1
A
remote repo
A
clone
How it works?
Local repo 1
A
A’
Modify
A => A’
remote repo
A
How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
A
How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
A
How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
Push
A’
How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
Push
Local repo 2
A
A’
How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
Push
Local repo 2
Pull
A’
A’
How it works?
Everyone with permission from
everywhere can get the
newest version and modify
history of that files
wheneve...
File management
Git solution
Install & try
Workflow
Tools
Black console
Can do everything
Need to remember commands
I rarely use it.
SourceTree
A GUI client for GIT
Don’t nee...
Install
http://www.sourcetreeapp.com/
https://git.dev.rakuten.com/projects/
LOTT/repos/teamsite/browse
Change local directory (where you want to
save to) if need
After clone
Add/ modify something (add file 1)
Move modified files from “working” to “staged”
Click “Commit”
add your comment ( what did you change, why,
where, etc )
Select your branches (master) to confirm the change
(push) to
update
to server
Select your branches (master) to confirm the change
(push) to
update
to server
Start a new modification?
1. Click
(pull) to
get latest
version
2. Confirm
source and
(OK)
Confirm the difference
(if required)
Start modification, test & save
Confirm modification
(if required)
Lines added+ some contents
Lines removed+ some contents
No changesome contents
Confirm modification => commit & push
File management
Git solution
Install & try
Workflow
clone modify
Add to stage
commit
pull
push
pull Get the latest source code
Add modification
Select what to update to serve...
Trouble?
clone modify
Add to stage
commit
pull
push
pull
1 time
start
end
Conflict
Other people modified the
same file and...
Modify (resolve conflict) and add to stage again
Git. EVEN more basic (for business people)
Git. EVEN more basic (for business people)
Git. EVEN more basic (for business people)
Git. EVEN more basic (for business people)
Upcoming SlideShare
Loading in …5
×

Git. EVEN more basic (for business people)

406 views
256 views

Published on

this slide is for a lecture, teaching business people to managing their html, image source code by Git.

Published in: Technology
2 Comments
1 Like
Statistics
Notes
No Downloads
Views
Total views
406
On SlideShare
0
From Embeds
0
Number of Embeds
4
Actions
Shares
0
Downloads
8
Comments
2
Likes
1
Embeds 0
No embeds

No notes for slide

Git. EVEN more basic (for business people)

  1. 1. Ver.2 for teamsite management Nguyen Minh Tuan @FSS
  2. 2. File management Git solution Install & try Workflow
  3. 3. File management Git solution Install & try Workflow
  4. 4. How are you Managing your files
  5. 5. Folder based File management?
  6. 6. Newest? Where was changed? Rollback?
  7. 7. 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
  8. 8. Version control
  9. 9. File management Git solution Install & try Workflow
  10. 10. Take snapshots of files in every version (commit)
  11. 11. 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)
  12. 12. 1 2 3 4 Get Get Have Can Revert to any previous version
  13. 13. How it works? remote repo A
  14. 14. How it works? Local repo 1 A remote repo A clone
  15. 15. How it works? Local repo 1 A A’ Modify A => A’ remote repo A
  16. 16. How it works? Local repo 1 A’ A’ Modify A => A’ Commit remote repo A
  17. 17. How it works? Local repo 1 A’ A’ Modify A => A’ Commit remote repo A
  18. 18. How it works? Local repo 1 A’ A’ Modify A => A’ Commit remote repo Push A’
  19. 19. How it works? Local repo 1 A’ A’ Modify A => A’ Commit remote repo Push Local repo 2 A A’
  20. 20. How it works? Local repo 1 A’ A’ Modify A => A’ Commit remote repo Push Local repo 2 Pull A’ A’
  21. 21. How it works? Everyone with permission from everywhere can get the newest version and modify history of that files whenever they need
  22. 22. File management Git solution Install & try Workflow
  23. 23. 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
  24. 24. Install http://www.sourcetreeapp.com/
  25. 25. https://git.dev.rakuten.com/projects/ LOTT/repos/teamsite/browse
  26. 26. Change local directory (where you want to save to) if need
  27. 27. After clone
  28. 28. Add/ modify something (add file 1)
  29. 29. Move modified files from “working” to “staged” Click “Commit”
  30. 30. add your comment ( what did you change, why, where, etc )
  31. 31. Select your branches (master) to confirm the change (push) to update to server
  32. 32. Select your branches (master) to confirm the change (push) to update to server
  33. 33. Start a new modification? 1. Click (pull) to get latest version 2. Confirm source and (OK)
  34. 34. Confirm the difference (if required)
  35. 35. Start modification, test & save
  36. 36. Confirm modification (if required)
  37. 37. Lines added+ some contents Lines removed+ some contents No changesome contents Confirm modification => commit & push
  38. 38. File management Git solution Install & try Workflow
  39. 39. 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
  40. 40. 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
  41. 41. Modify (resolve conflict) and add to stage again

×