The document discusses various aspects of Git workflows, emphasizing its advantages in code versioning and collaboration. It provides a personal account of the author, Roman Kuba, detailing his experience as a lead frontend developer and the tools he utilizes, including many programming languages and frameworks. Additionally, it outlines steps for using Git effectively, such as creating branches, handling merge conflicts, and utilizing Git platforms like GitHub.

1. Git Workflows
, and life gets simple again

2. I
whoami

3. Roman
Kuba
- FH-Master 2012
- Freelancer
- Lead Frontend Dev
@Codeship
- @Codebryo

4. Projects
I had the pleasure to work for and with …
Adidas, ServusTV, ORF, APA, David Copperfield,
Toursprung, and many more

5. Projects
Currently I am working as Lead Frontend Developer at
Codeship. (www.codeship.io)

6. Tools & Languages
Photoshop, Illustrator, Sketch, JS, CoffeeScript, Sass,
Stylus, Jade, Slim, PHP, Ruby, Python, Codeigniter, Laravel,
Ruby on Rails, HTML, Sublime Text, Atom, SVN, Git,
Jasmin, Cucumber, Spec, Zepto, jQuery, AngularJS,
Ember, Knockout, MySQL, PostgreSQL, SQLite, Redis

7. Tools & Languages
Photoshop, Illustrator, Sketch, JS, CoffeeScript, Sass,
Stylus, Jade, Slim, PHP, Ruby, Python, Codeigniter, Laravel,
Ruby on Rails, HTML, Sublime Text, Atom, SVN, Git,
Jasmin, Cucumber, Spec, Zepto, jQuery, AngularJS,
Ember, Knockout, MySQL, PostgreSQL, SQLite, Redis

8. II
what the git ?

9. Code Versioning

10. Write some Code -> Save it
Change some Code
Delete some Code -> Save it
Oops I need some old code -> Revert it
Do new Stuff -> Save it
Eat some Pizza

11. First there was
SVN

12. First there was
SVN

13. I'm an egotistical bastard, and I name all my
projects after myself. First Linux, now git.
–Linus Torwalds

14. I'm an egotistical bastard, and I name all my
projects after myself. First Linux, now git.
–Linus Torwalds
an unpleasant or contemptible person.
git

15. What to know about Git
light, easy, robust
branches are gooood
collaboration is awsm
world leader in Software Versioning
Platforms like GitHub, BitBucket, Gitlab, …

16. Important Commands
pull
add
commit
push
merge
checkout

17. III
example

18. master

19. master
+ README.md
add + commit + push

20. master
+ Feature start
add + commit + push

21. master

22. master
+ Feature 2 start
add + commit + push

23. master
2 Features started …
bugs ?

24. master
2 Features started …
bugs ? BAD PRACTICE

25. master

26. master
+ Feature start
add + commit + push
f-a

27. master
f-a f-b
+ Feature 2 start
add + commit + push

28. master
f-a f-b
GOOD PRACTICE

29. master
f-a f-b

30. master
f-a f-b
+ Feature complete
+ merge

31. master
f-a f-b
+ Feature Ready

32. master
f-a f-b

33. master
f-a f-b

34. master
f-a f-b

38. IV
TODO

39. Phase 1
Create a Github Account
Download the Github App
Create a new Repository Locally
Add a Project and Push it to Github
Make some changes and Push again

40. Phase 2
Create a Branch
Make Changes ( 2 -3 commits ) to the Branch and
Publish it
Merge the Branch into Master

41. Phase 3
Invite another User to your Project
Checkout the other Project
Make Similar changes to the same file and let the owner
push second
Solve the Merge Conflict
Push and be happy

42. V
Advanced

43. Git Extras
https://github.com/visionmedia/git-extras

44. Smart Branching
Create feature and bug branches:
feature/flux-compensator
bug/fix-leaking-on-flux-compensator

45. Don't merge alone
Create Pull Requests for your Branches

46. but…
you need to use the Terminal ( or other Software ) to have
this "smart" branching

47. VI
Extras

48. It's always worth to git
Git for every project you have.

49. Use a good Editor
Have you tried Atom ?
https://atom.io/

50. thats just the beginning
Codeship and others help you for the steps
beyond your git repository

51. VII
Questions