created: 20160210143307542
creator: user
modified: 20160210151813129
modifier: user
tags: 
title: GIT getting started
type: text/x-markdown

# branching

make sure you have the latest version:
`git fetch`

goto branch you want to branch off:
`git checkout development`

create a new branch:
`git checkout -b newBranchName`

# switching branches

stash local changes:
`git stash`

goto other branch:
`git checkout otherBranch`

retore stashed files (or not)
`git stash pop`

see `git help stash` for more features.

# merging with development

goto branch you want to merge INTO:
`git checkout newBranchName `

make sure you'll merge with latest version:
`git fetch`

merge **origin/development** into it:
`git merge origin/development`

have fun resolving any conflicts


# making a pull request

create a branch: see #branching

**do your development**

 see #merge with development

push your branch

goto github and press "new pull request" button

choose "development" as base and "newBranchName" as compare