Social Coding – with Git & Github – Level 1: Getting Started



Social Coding – with Git & Github – Level 1: Getting Started

0 0


naterock.github.io


On Github naterock / naterock.github.io

Social Coding

with Git & Github

Original Slides by Andrew Turner, ESRI

slides: heorb.it/socialcoding

Level 1: Getting Started

Git

25edcfe3312d7f7a307427265845e53a6b3fda10 From Linus Torvalds - created to manage Linux kernel contributions

Distributed version control

git clone git@github.com:Esri/presentations.git

Simple branching

git branch naterock-featuregit checkout -b naterock-featuregit commit -am 'Added some new slides'git checkout master

What is Github?

  • Hosted Git
  • Social Network for Code

Level 2: Working in Git

init add commit pull push

Your first Repo

git initgit add Readme.mdgit commit -am 'Initial Commit'

Working through Github

Create or Fork a Project

git clone git@github.com:naterock/project.gitgit commit -am 'Fixed issue with bad Titles #345'git push naterock master

Level 3: Better Collaboration

checkout merge

Branching

git checkout -b naterock-newfeaturegit commit -am 'Added feature #582'git push naterock naterock-newfeaturegit checkout mastergit merge naterock-newfeature

Pushing Back

git remote add upstream git@github.com:Esri/project.gitgit push upstream master

Level 4: Master

pull-request rebase

Contributing with Pull-Request

git pull-request -b esri:master -h naterock:master

Keeping a Clean History

git checkout naterock-newfeaturegit rebase upstream master

Ephiphany: Going Social

Pull-Requests & Code Reviews

Gists

Level 0: Tools of the Trade

Gooey Clients

windows.github.com

Gooey Clients

mac.github.com

Gooey Clients

sourcetreeapp.com

Gists

...still git

bl.ocks.org

Github Wiki

(Markdown)[http://whatismarkdown.com/]

...still git

gh-pages

git checkout -b gh-pagesgit push naterock gh-pages

Huboard

MGP and GIS Consortium

Specialists

  • Professional Development
  • Customized Site Scripts
  • BI Queries
  • Story Maps

Analysts

  • Maintaining Site Code Customizations
  • Collaborative Problem Solving
  • Documentation

GIS Consortium

  • Collaboration between Communities
  • Organization Accounts
  • Documentation

Jump in!