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

1. Ver.2 for teamsite management
Nguyen Minh Tuan @FSS

2. File management
Git solution
Install & try
Workflow

3. File management
Git solution
Install & try
Workflow

4. How are you
Managing
your files

5. Folder based
File management?

7. Newest?
Where was changed?
Rollback?

9. 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

10. Version control

11. File management
Git solution
Install & try
Workflow

12. Take snapshots of files in
every version (commit)

13. 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)

15. 1 2 3 4
Get Get Have
Can Revert
to any previous version

16. How it works?
remote repo
A

17. How it works?
Local repo 1
A
remote repo
A
clone

18. How it works?
Local repo 1
A
A’
Modify
A => A’
remote repo
A

19. How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
A

20. How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
A

21. How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
Push
A’

22. How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
Push
Local repo 2
A
A’

23. How it works?
Local repo 1
A’
A’
Modify
A => A’
Commit
remote repo
Push
Local repo 2
Pull
A’
A’

24. How it works?
Everyone with permission from
everywhere can get the
newest version and modify
history of that files
whenever they need

25. File management
Git solution
Install & try
Workflow

26. 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

27. Install
http://www.sourcetreeapp.com/

28. https://git.dev.rakuten.com/projects/
LOTT/repos/teamsite/browse

29. Change local directory (where you want to
save to) if need

30. After clone

31. Add/ modify something (add file 1)

32. Move modified files from “working” to “staged”
Click “Commit”

33. add your comment ( what did you change, why,
where, etc )

34. Select your branches (master) to confirm the change
(push) to
update
to server

35. Select your branches (master) to confirm the change
(push) to
update
to server

36. Start a new modification?
1. Click
(pull) to
get latest
version
2. Confirm
source and
(OK)

37. Confirm the difference
(if required)

38. Start modification, test & save

39. Confirm modification
(if required)

40. Lines added+ some contents
Lines removed+ some contents
No changesome contents
Confirm modification => commit & push

41. File management
Git solution
Install & try
Workflow

42. 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

43. 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

45. Modify (resolve conflict) and add to stage again