## <i class="fa fa-code-fork"></i> Git for you and me
####_DrupalCorn 2015_



## [http://bit.ly/git-drupalcorn](http://bit.ly/git-drupalcorn)

Note:
- Slides and speaker notes available online



## Alina Mackenzie
#### _University of Illinois at Chicago_
<img src="custom/images/alimac-avatar.png">

<a href="https://www.drupal.org/u/alimac"><i class="fa fa-drupal"></i> alimac</a>

<a href="https://twitter.com/czaroxiejka"><i class="fa fa-twitter"></i> czaroxiejka</a>

char • o • jay • ka
<!-- .element class="fragment" style="word-spacing: 8px;" -->

Note:
- Developer and system administrator based in Chicago
- Doing Drupal for ~4 years, active in the community for ~2 years



## Plan



## Why



## How



## Distributed or centralized?



## Hosting



## Command line and apps



## Configure



## Setting



## Phases



## Sidekicks



## Commit



## Push



## Undoing



## Branching



## Merging



## Rebasing



## Conflicts



## More than one way



## What next?

<!-- .slide: data-background="#fff" -->
# <i class="fa fa-code-fork"></i> Git for you and me
### DrupalCorn 2015



## [http://bit.ly/git-drupalcorn](http://bit.ly/git-drupalcorn)

Note:
- Slides and speaker notes available online



## Alina Mackenzie
#### _University of Illinois at Chicago_
<img src="custom/images/alimac-avatar.png">

<a href="https://www.drupal.org/u/alimac"><i class="fa fa-drupal"></i> alimac</a>

<a href="https://twitter.com/czaroxiejka"><i class="fa fa-twitter"></i> czaroxiejka</a>

char • o • jay • ka
<!-- .element class="fragment" style="word-spacing: 8px;" -->

Note:
- Developer and system administrator based in Chicago
- Doing Drupal for ~4 years, active in the community for ~2 years



## Plan



## Why



## How



## Distributed or centralized?



## Hosting



## Command line and apps



## Configure



## Setting



## Phases



## Sidekicks



## Commit



## Push



## Undoing



## Branching



## Merging



## Rebasing



## Conflicts



## More than one way



## What next?

Update headings and background of title slide.
Update headings and background of title slide.
