Getting the code

To get a copy of the code (but not be set up for contributing back yet):

• Go the the project's GitHub page
• Find the clone url

Getting the code

Getting the code

To get a copy of the code (but not be set up for contributing back yet):

• Go the the project's GitHub page
• Find the clone url
• Ensure you have the HTTPS url

Getting the code

Getting the code

To get a copy of the code (but not be set up for contributing back yet):

• Go the the project's GitHub page
• Find the clone url
• Ensure you have the HTTPS url
• Clone it

git clone https://github.com/andybalaam/rabbit-escape.git

Making your own project

To make a new project:

• Create a new repo on GitHub

Making your own project

To make a new project:

• Create a new repo on GitHub
• Make sure you have uploaded an SSH public key

Making your own project

Making your own project

To make a new project:

• Create a new repo on GitHub
• Make sure you have uploaded an SSH public key
• Clone it via SSH

Making your own project

Making your own project

• Create a new repo on GitHub
• Make sure you have uploaded an SSH public key
• Clone it via SSH

git clone git@github.com:andybalaam/rabbit-escape.git

Making your own project

• Create a new repo on GitHub
• Make sure you have uploaded an SSH public key
• Clone it via SSH
• Make changes, and commit
• Push them

git push origin master

Making your own project

Making your own project

Making your own project

Side note

• Commits are frozen states of the code+history
• Commits have parents (commits that came before)
• A branch is a pointer to a commit
• By default there is one branch called "master"
• Branches live inside repos

Side note

• git commit makes a commit and repoints the current branch to it
• git branch makes a new branch
• git checkout changes which branch is current (among other things)
• git merge gets all the commits from another branch
• git rebase makes all the commits on this branch look like they happened after everything on another branch

Side note

• git pull gets all the commits from a branch on a remote repo and adds them to the current branch
• git push sends all the commits on the current branch to a branch on a remote repo

Contributing

• Someone else has a GitHub repo
• You want to send them code

Forking

• Don't clone - fork

Forking

• Don't clone - fork
• Forking makes a new repo - this will be your "origin"
• The original repo we will call "upstream"

Forking

• Clone your fork via SSH

git clone git@github.com:MY_USERNAME/rabbit-escape.git

Forking

Making a Merge Request

• Make a local branch
• Make changes on it
• Push the branch to your fork
• Click "Merge Request" on GitHub

Making a Merge Request

• Make a local branch
• Make changes on it

git branch fix-bug
git checkout fix-bug
git commit -a -m "Bug fix part 1"
git commit -a -m "Bug fix part 2"

Making a Merge Request

Making a Merge Request

• Make a local branch
• Make changes on it
• Push the branch to your fork

git push origin fix-bug

Making a Merge Request

Making a Merge Request

• Make a local branch
• Make changes on it
• Push the branch to your fork
• Click "Merge Request" on GitHub

Making a Merge Request

Wait

Making a Merge Request

Making a Merge Request

Done!

Unless...

Improving a Merge Request

Improving a Merge Request

• Change history locally
• Force push to your fork

Improving a Merge Request

• Change history locally

git commit --amend
git rebase -i master
git reset HEAD^
git commit

Improving a Merge Request

• Change history locally
• Force push to your fork

git push -f origin fix-bug

Improving a Merge Request

Improving a Merge Request

Done!

Unless...

Keeping in sync

Keeping in sync

• Add upstream as a remote
• Pull upstream master onto local master
• Rebase local branch on top of local master
• Force push to your fork

Keeping in sync

• Add upstream as a remote

git remote add upstream https://github.com/THEIR_USERNAME/rabbit-escape.git

Keeping in sync

• Add upstream as a remote
• Pull upstream master onto local master

git checkout master

# Should succeed if you have not committed onto master:
git pull --ff-only upstream master   
                           
# Otherwise:
git pull --rebase upstream master   

Keeping in sync

Keeping in sync

• Add upstream as a remote
• Pull upstream master onto local master
• Rebase local branch on top of local master

git checkout fix-bug
git rebase master

Keeping in sync

Keeping in sync

• Add upstream as a remote
• Pull upstream master onto local master
• Rebase local branch on top of local master
• Force push to your fork

# Make sure we are on fix-bug:
git checkout fix-bug

git push -f origin fix-bug

Keeping in sync

More info

Donate!	patreon.com/andybalaam
Play!	Rabbit Escape
Videos	youtube.com/user/ajbalaam
Twitter	@andybalaam
Blog	artificialworlds.net/blog
Projects	artificialworlds.net