Git and GitHub crash course

1. Git and GitHub crash Course by Mireia Sangalo @MyPitit

2. 1. What is GitHub 2. What is Git 3. Diferences? 4. Git ﬂow 1. Agenda

3. 2. Agenda GitHub A walkthrough GitHub platform: 1. How to create an organisation 2. How to create a repository 3. Raising issues 4. Creating pull requests 5. Merging pull requests 6. Introduction to Wiki pages

4. Git 1. Clone a repository 2. Create / delete / change branch 3. Add / Push / Commit 4. Pull from master 3. Agenda

5. Let’s go!

6. 1. What is GitHub 2. What is Git 3. Diferences? 4. Git ﬂow 1. Agenda

7. 1.1. What is GitHub? • Web-based Git repository hosting service. • It can be public or private, you can choose. • If you want to create a private repositories you will need to pay a small fee. • If your repositories are public you can use the service for free.

8. 1. What is GitHub 2. What is Git 3. Diferences? 4. GitHub ﬂow 1. Agenda

9. 1. 2. What is Git? Git is a free and open source distributed version control system that is used for software development.

10. Git was initially designed and developed by Linus Torvalds for Linux kernel development in 2005.

12. 1. 3. Diferences

13. • GitHub is a Git repository hosting service. • GitHub provides Web-based graphical interface. • Git is a command line tool. • With GitHub you can copy a repository from one user’s account to another (fork). You can send notiﬁcations (pull request). You can merge the changes with one click.

15. 1. 4. GitHub ﬂow

17. 2. Agenda GitHub A walkthrough GitHub platform: 1. How to create an organisation 2. How to create a repository 3. Raising issues 4. Creating pull requests 5. Merging pull requests 6. Introduction to Wiki pages 7. README

18. 2. 1. How to create an organisation

20. 2. 2. How to create a repository

22. 2. 3. Raising Issues

24. 2. 4. Creating a pull request

26. 2. 5. Merging a pull request

28. 2. 6. Wiki

30. 2. 7. README.md

33. 3. 1. Clone a repository $ git clone [email protected]:GitHubTutorialQUML/Tutorials.git Cloning into 'Tutorials'... remote: Counting objects: 3, done. remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (3/3), done. Checking connectivity... done.

35. Branches Why do you need branches?

37. 3. 2. Create a new branch $ git branch example $ git branch example * master

38. 3. 2. Changing branches $ git checkout example Switched to branch 'example' $ git checkout master Switched to branch 'master' Your branch is up-to-date with 'origin/master'.

39. 3. 2. Delete a branch $ git branch -D example Deleted branch example (was 5d0662d).

41. 3. 3. Add / Push / Commit $ git add . $ git commit -m "my 1st commit" [example 5d0662d] my 1st commit 1 file changed, 3 insertions(+), 1 deletion(-) $ git push origin example Counting objects: 3, done. Writing objects: 100% (3/3), 271 bytes | 0 bytes/s, done. Total 3 (delta 0), reused 0 (delta 0) To [email protected]:GitHubTutorialQUML/Tutorials.git * [new branch] example -> example

42. Everything was perfect until one day…

43. Merge conﬂicts time!!

44. What is a merge conﬂict?

47. 3. 4. Pull from master mypitit@nietzsche: ~/Desktop/example/Tutorials $ git pull <remote> remote: Counting objects: 11, done. remote: Compressing objects: 100% (5/5), done. remote: Total 7 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (7/7), done. From ssh://my.remote.host.com/~/git/myproject * branch master -> FETCH_HEAD Updating 9d447d2..f74fb21 Fast forward app/controllers/tutorials | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)

48. Questions?

Git and GitHub crash course

More Related Content

What's hot (19)

Similar to Git and GitHub crash course (20)

Recently uploaded (20)

Git and GitHub crash course