Git & Github

Speakers

• Mohit Kumar Bajoria
• Iresh Mishra

Quick Poll

• What is source code?
• What is open source?
• Who has used git?
• Who has used github?

Open Source?

• Source code is available (to Mess) with, modify it and can be distributed generally.
• It can be free or not.

You told me source code is available to play with but where I will get the source code.

Github is one of the place on Internet where you can get source code of various famous open source projects like VLC, AngularJS, ReactJS etc.

GitHub makes it easier to...

• make your code Open Source

• manage literally any number of contributors

• manage versions of your product

• follow a well defined structure to complete the project

• contribute into projects of your choice

• find open source projects to work on

• create an online portfolio of your skills

• What is Open Source?
• Git
• Github

Getting your hands dirty..

Sign Up on Github

https://github.com/

Setting up Git

• You can download git from http://git-scm.com/downloads
•  Tell Git your name

• Tell Git your E-mail                                      

Create a local copy of Github repository

$ git clone https://github.com/mbj36/Github-Workshop.git

It will create a folder in your computer with the same files on github.

Review

• Setting up git on your computer
• What is a Repository?
• How to clone a Github Repository

Create a new file in your project like sfd.txt

Software Freedom Day is everywhere!
SFD is a yearly celebration for Software Freedom!
Every year there are thousands teams organizing
Software Freedom Day in different
countries and cities.

sfd.txt

Great! you have created a new file locally. Now its time to send this file on Github so others can see it.

Now Git will come into picture

Git will version control this file named sfd.txt to record the changes happening with file over time.

 Git status

Run git status inside project folder.

 Git add

Run git add for tracking new files.

hp lapi@hp MINGW64 ~/Desktop/Github-Workshop (master)
$ git add -all

 Git status

Check the status again.

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   sfd.txt

 Git commit

It is a snapshot of your code.

hp lapi@hp MINGW64 ~/Desktop/Github-Workshop (master)
$ git commit -m"Created Text File"
[master 1977c06] Created Text File
 1 file changed, 5 insertions(+)
 create mode 100644 sfd.txt

-m = commit message

 Git status

Check the status again.

hp lapi@hp MINGW64 ~/Desktop/Github-Workshop (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean

We have created sfd.txt file locally but how to send it to Github

 Git push

Git push send all commits to github.

hp lapi@hp MINGW64 ~/Desktop/Github-Workshop (master)
$ git push origin master
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 402 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To https://github.com/mbj36/Github-Workshop.git
   218a38a..1977c06  master -> master

$ git push "Remote Name" "Branch Name"

ex - $ git push origin master

Great you have made your first Open Source contribution.

Review

• Git status
• Git add
• Git commit
• Git push

Find a project that interests you and fork it

Fork?

It is creating a copy of project to your account.

Original Project

Pull Requests

Hey(Repo Owner), I have made some changes in this repo, can you add those up with the main repo?

Open a Pull Request

With Pull request you are asking the maintainer of project to add your changes to the main project.

Github Remotes

Github Remotes are like variables which have the values as the link to a particular repo on Github remote server.

Now anytime when you run "git fetch upstream" it will check your local files against this repo.

$ git remote add upstream "REPO LINK"

 $ git remote add upstream "https://github.com/smvdu/sfd-smvdu.git"

$ git fetch "REMOTE NAME"

$ git merge "REMOTE NAME"/"BRANCH NAME"

Git Fetch

"git fetch" gets the latest code from the parent repo and add it directly to your local repo.

Review

• Fork a project
• Follow Git Mantra
• Open a Pull Request

Git beyond basics

• git rebase
• git merge 
• git stash
• git reset
• solve git conflicts

Learning Resources

• https://try.github.io
• https://www.udacity.com/course/how-to-use-git-and-github--ud775
• https://www.codeschool.com/courses/git-real

Any Questions?

Thank You