Git/Github &

SalesforceGordon Bockus 03/27/2017

• Git overview

• Github overview

• Should I use this as a Salesforce developer?

• What about SFDX?

• Questions

What is Git?

• Who has used Git?

• Version Control System for tracking changes and

coordinating work on files among multiple people

What?

• A tool for helping multiple people all work on the

same code base without losing their minds.

Maybe a picture will help

Branches, commits, and merges….oh my

What again?

• Branches

• Commits

• Merges

• Pull request

• Rebase

Distributed Version Control

System

• Remote (Github) - Merges happen here (mostly)

• branches

• commits

• Local (your machine) - Edits happen here (mostly)

• branches

• commit

Distributed Version Control

System

Demo

Github and friends

• Github

• BitBucket

• Stash

• ??????

Github like service

• User access control

• Pull Requests

• Ticketing system

• and more…..

Do I need this?

• Yes, yes you do

• Let computers do their thing

• Made a change to code, realized it was a mistake and wanted to revert back?

• Lost code or had a backup that was too old?

• Had to maintain multiple versions of a product?

• Wanted to see the difference between two (or more) versions of your code?

• Wanted to prove that a particular change broke or fixed a piece of code?

• Wanted to review the history of some code?

• Wanted to submit a change to someone else's code?

• Wanted to share your code, or let other people work on your code?

• Wanted to see how much work is being done, and where, when and by whom?

• Wanted to experiment with a new feature without interfering with working code?

• In these cases, and no doubt others, a version control system should make your life easier.

• To misquote a friend: A civilized tool for a civilized age.

Salesforce

• Org is the final say in what code/configs exists

• Can be manually altered

• Sandboxes are…well sandboxes

• Hard to tell what was changed when

SF + git (Today)

• Force migration tool (Ant)

• Illuminated Cloud

• Eclipse

• jsforce

• …lots of options

Changes from Admins

• Create branch off master and deploy to org

• Changes are made form SF UI

• pull in changes from org

• Merge with latest from master and open PR

Salesforce DX

• Automated deployments from GitHub

repositories

• Continuous integration triggered by repository

activity

• Basically takes some things that are hard but

possible today and makes them simple

Final Word

• Git is Awesome (and free)

• You should be using it

• Come on…everybody's doing it