"git with it"

A few tips on using git. Atomic commits FTW!

Talk given at LeedsPHP meet-up on 18/10/17. (https://www.meetup.com/preview/leedsphp/events/243229198)

Transcript

1. “git with it” A few tips on using git in teams Tom de Bruin | @deadlyhifi
2. My VCS History Alone Agency Single product teams
3. 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?
4. 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/
5. Communication
6. With Great Power… Practice “good practice”
7. 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
8. Branching
9. Make each feature a separate commit git commit -m “ticket-1 - fix code style issues … git commit -m “ticket-1 - update config
10. While you were working…
11. Rebasing
12. 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.
13. Merge conflict!
14. Demo
15. “git push --force” “git push --force-with-lease”
16. 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" }
17. 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)
18. Any Tips to Share? Any Questions? Tom de Bruin | @deadlyhifi