Github in practice

Transcript

1. 1.

   GITHUB IN PRACTICE Jaime Arias Inria Grenoble Rhône-Alpes February 2017

   * Figures in this presentation are inspired by the books listed at the end. 1
2. 2.

   WHAT IS GIT? Version control system (VCS) for tracking changes

   in computer files and coordinating work on those files among multiple people 2
3. 3.

   GITHUB, GITLAB AND COMPANY ≠ Web-based git repository. Provides access

   control and collaboration features (i.e., bug tracking, wiki, task management). 3
4. 4.

   IT'S TIME TO TAKE THE BULL BY THE HORNS !

   4
5. 5.

   BASIC CONFIGURATION 5

6. 6.

   INITIALIZATION OF AN EMPTY LOCAL REPOSITORY 6

7. 7.

   ADDING CHANGES TO THE REPOSITORY 7

8. 8.

   ADDING CHANGES TO THE REPOSITORY 8

9. 9.

   ADDING CHANGES TO THE REPOSITORY 9

10. 10.

    ADDING CHANGES TO THE REPOSITORY 10

11. 11.

    ADDING CHANGES TO THE REPOSITORY 11

12. 12.

    ADDING CHANGES TO THE REPOSITORY 12

13. 13.

    ADDING CHANGES TO THE REPOSITORY 13

14. 14.

    ADDING CHANGES TO THE REPOSITORY 14

15. 15.

    SHOWING CHANGES AND HISTORY 15

16. 16.

    DIFF & LOG The diff command shows the changes that

    have been made to the tracked files in the repository since the last commit. The log command shows the commits that have been made so far. 16
17. 17.

    DIFF & LOG 17

18. 18.

    BRANCHING IN GIT 18

19. 19.

    BRANCHING IN GIT 19

20. 20.

    BRANCHING IN GIT 20

21. 21.

    BRANCHING IN GIT 21

22. 22.

    BRANCHING IN GIT 22

23. 23.

    INTEGRATE CHANGES 23

24. 24.

    MERGING 24

25. 25.

    MERGING 25

26. 26.

    WHEN SOMETHING IS NOT GOING WELL ... 26

27. 27.

    CONFLICT 27

28. 28.

    CONFLICT 28

29. 29.

    CONFLICT 29

30. 30.

    CONFLICT 30

31. 31.

    CONFLICT 31

32. 32.

    UNDO GIT ADD If you've just asked Git to track

    a new file, you can undo the operation by running the reset command. 32
33. 33.

    UNDO GIT COMMIT 33

34. 34.

    UNDO GIT COMMIT 34

35. 35.

    GETTING STARTED IN A TEAM 35

36. 36.

    WORKING ON AN EXISTING PROJECT 36

37. 37.

    WORKING ON AN EXISTING PROJECT 37

38. 38.

    WORKING ON AN EXISTING PROJECT 38

39. 39.

    COLLABORATION WORKFLOW 39

40. 40.

    UPLOAD LOCAL CHANGES TO THE REMOTE SERVER 40

41. 41.

    UPLOAD LOCAL CHANGES TO THE REMOTE SERVER 41

42. 42.

    UP-TO-DATE ABOUT REMOTE CHANGES 42

43. 43.

    INTEGRATE REMOTE CHANGES 43

44. 44.

    PUBLISH A LOCAL BRANCH 44

45. 45.

    PUBLISH A LOCAL BRANCH 45

46. 46.

    TRACK A REMOTE BRANCH 46

47. 47.

    ADVANCED TIPS 47

48. 48.

    IGNORING FILES For a useful starting point of files to

    ignore, check out gitignore.io 48
49. 49.

    FIXING UP THE MOST RECENT COMMIT 49

50. 50.

    STASHING YOUR WORK The stash command takes your uncommited changes

    and saves them away for later use. 50
51. 51.

    THANK YOU FOR YOUR ATTENTION ! 51

52. 52.

    FURTHER READING Shaumik Daityari. Jump Start Git: Take Control of

    Your Code and Assets. 2015 Emma Jane Hogbin Westby. Git for Teams: A User-Centered Approach to Creatin Efficient Workflows in Git. 2015 Mike McQuaid. Git in Practice: Includes 66 Techniques. 2015 Git Documentation: https://git-scm.com 52