“git with it” A few tips on using git in teams Tom de Bruin | @deadlyhifi 

My VCS History Alone Agency Single product teams 

What’s the point of a VCS? ● You don’t want to lose your code ● You want a history of your work. ● You want to have multiple people committing to the same code base. ● You want to make it easy to deploy your code. ● You want to easily experiment with ideas. ● Any others? 

Margaret Hamilton (NASA) https://qz.com/726338/the-code-that-took-america-to-the-moon-was-just-publis hed-to-github-and-its-like-a-1960s-time-capsule/ 

Communication 

With Great Power… Practice “good practice” 

Atomic Commits “In the field of computer science an atomic commit is an operation that applies a set of distinct changes as a single operation…” https://en.wikipedia.org/wiki/Atomic_commit 

Branching 

Make each feature a separate commit git commit -m “ticket-1 - fix code style issues … git commit -m “ticket-1 - update config 

While you were working… 

Rebasing 

Rebasing git rebase master ● Goes back to the point you branched off master and replay your commits ● This happened ● Then this happened ● Then this happened git rebase -i HEAD~3 ● If you need to amend a particular commit just go back to it and make the changes. 

Merge conflict! 

Demo 

“git push --force” “git push --force-with-lease” 

Top tip # list git branches with their descriptions function gb() { branch="" branches=`git branch --list` while read -r branch; do clean_branch_name=${branch//\*\ /} description=`git config branch.$clean_branch_name.description` printf "%-15s %s\n" "$branch": "$description" done <<< "$branches" } 

More Information https://services.github.com/on-demand/ https://help.github.com/articles/git-and-github-learning-resources/ https://abookapart.com/products/git-for-humans https://try.github.io (by Code School) 

Any Tips to Share? Any Questions? Tom de Bruin | @deadlyhifi