Github in practice

E49d1bfa9f9443686cbb9b4aaf6298af?s=47 Jaime Arias Almeida
February 06, 2017
Technology
1
65

Github in practice

Talk gave in the Mistis Seminar

E49d1bfa9f9443686cbb9b4aaf6298af?s=128

Jaime Arias Almeida

February 06, 2017
Tweet

More Decks by Jaime Arias Almeida

See All by Jaime Arias Almeida
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
1
48
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
1
27
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
0
74
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
0
73
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
0
29
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
0
76
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
0
120
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
0
35
E49d1bfa9f9443686cbb9b4aaf6298af?s=48 himito
0
38

Other Decks in Technology

See All in Technology
53850955f15249a1a9dc49df6113e400?s=48 line_developers
0
140
Cd823abda454a7a2065fe6fe273ae84b?s=48 viva_tweet_x
2
260
75fd80a8ace6ab292a7de563e018ae11?s=48 takashi_toyosaki
0
230
F3f3eec8682a76ed430054e8fd994f15?s=48 tmnakagawa
0
740
79dcb04101764d7bf66f898dd446838e?s=48 tsukubachallenge
0
230
229b1596ce57cd0935a2bacd410d87a0?s=48 aaaddress1
1
310
2102a6b8760bd6f57f672805723dd83a?s=48 line_developers_tw
0
3.7k
2cf373725ded741824c50fd571eda6e1?s=48 udzura
0
1.1k
Cd891a89dfec6ca7bd278b5f5bd87c90?s=48 tzkoba
1
410
24837993455f54c957883ba1f1db7f2d?s=48 atsushieno
1
110
Dd672f13e7e17714700544cb355cbaba?s=48 kyoshimoto
2
210
470bbf16e3547a17e40c34da937be921?s=48 kikmysy4
0
140

Featured

See All Featured
F68cb25ae3e5c2106997454b13b7737d?s=48 brad_frost
154
6.1k
465724d73fe3a92c0879fdfb43a3a6f3?s=48 philhawksworth
190
8.6k
E837d2996f52008ace055a08fbfff992?s=48 frogandcode
121
20k
Ef32e0b1ac5082450dc8c1fca3a26b5c?s=48 cherdarchuk
65
250k
170b760e0147792d0140e59ec78e9893?s=48 eitanlees
105
9.4k
5f2da528927a2ec9ba4fec2069cbc958?s=48 kneath
293
38k
282d599b414022eba5096510f675b6e2?s=48 chrislema
231
16k
20bfe76b3d6105641f879fe45cfc9272?s=48 bkeepers
319
53k
A0517b08532aec8ab2aae3f65d40ad86?s=48 hannesfritz
26
850
9cde37f47e4a800ea081ea42de8d749a?s=48 dougneiner
119
7.7k
1b8ad785acdd1ce1c99914b1c2a4e10e?s=48 sugarenia
230
750k
433acaea1012b25d97ae66da9b998dad?s=48 malarkey
391
60k

Transcript

  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. WHAT IS GIT? Version control system (VCS) for tracking changes

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

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

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

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

    4

  5. BASIC CONFIGURATION 5

  6. INITIALIZATION OF AN EMPTY LOCAL REPOSITORY 6

  7. ADDING CHANGES TO THE REPOSITORY 7

  8. ADDING CHANGES TO THE REPOSITORY 8

  9. ADDING CHANGES TO THE REPOSITORY 9

  10. ADDING CHANGES TO THE REPOSITORY 10

  11. ADDING CHANGES TO THE REPOSITORY 11

  12. ADDING CHANGES TO THE REPOSITORY 12

  13. ADDING CHANGES TO THE REPOSITORY 13

  14. ADDING CHANGES TO THE REPOSITORY 14

  15. SHOWING CHANGES AND HISTORY 15

  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. DIFF & LOG 17

  18. BRANCHING IN GIT 18

  19. BRANCHING IN GIT 19

  20. BRANCHING IN GIT 20

  21. BRANCHING IN GIT 21

  22. BRANCHING IN GIT 22

  23. INTEGRATE CHANGES 23

  24. MERGING 24

  25. MERGING 25

  26. WHEN SOMETHING IS NOT GOING WELL ... 26

  27. CONFLICT 27

  28. CONFLICT 28

  29. CONFLICT 29

  30. CONFLICT 30

  31. CONFLICT 31

  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. UNDO GIT COMMIT 33

  34. UNDO GIT COMMIT 34

  35. GETTING STARTED IN A TEAM 35

  36. WORKING ON AN EXISTING PROJECT 36

  37. WORKING ON AN EXISTING PROJECT 37

  38. WORKING ON AN EXISTING PROJECT 38

  39. COLLABORATION WORKFLOW 39

  40. UPLOAD LOCAL CHANGES TO THE REMOTE SERVER 40

  41. UPLOAD LOCAL CHANGES TO THE REMOTE SERVER 41

  42. UP-TO-DATE ABOUT REMOTE CHANGES 42

  43. INTEGRATE REMOTE CHANGES 43

  44. PUBLISH A LOCAL BRANCH 44

  45. PUBLISH A LOCAL BRANCH 45

  46. TRACK A REMOTE BRANCH 46

  47. ADVANCED TIPS 47

  48. IGNORING FILES For a useful starting point of files to

    ignore, check out gitignore.io 48

  49. FIXING UP THE MOST RECENT COMMIT 49

  50. STASHING YOUR WORK The stash command takes your uncommited changes

    and saves them away for later use. 50

  51. THANK YOU FOR YOUR ATTENTION ! 51

  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