Git <> Codies

Transcript

3. Version control with Git
4. Github vs. GitLab vs. Bitbucket
5. Github
6. What is your current version control system?
7. What is your current version control system? 1. How do you manage different file versions? 2. How do you work with collaborators on the same files? 3. How much would your science suffer if your workstation exploded right now? (scale from 1-10)
8. What is git • Version control system. • Manage different versions of files. • Collaborate with yourself. • Collaborate with other people.
9. Why use git “Always remember your first collaborator is your future self, and your past self doesn’t answer emails” - Christie Bahlai
10. What is git good for? Backup Reproducibility Collaboration Organization Transparency
11. Command line git
12. Initializing a repository Prerequisites: ▶ git installed (check with which git) ▶ git configured (check with git config --list) git config --global user.name "Vlad Dracula" git config --global user.email "vlad@tran.sylvan.ia" git config --global color.ui "auto" git config --global core.editor "nano"
13. Initializing a repository git git init
14. Checking repository status git status
15. Adding your file git add your_filename.R or, to add everything git add --all
16. Ignoring files .gitignore
17. Adding a remote repository git remote add origin git@github.com:Codies/trygit.gitt
18. Checking repository status git status
20. Committing Once you’re sure that you’re changes are worth saving (THIS WILL GO ON YOUR PERMANENT RECORD) git commit -m 'changed x, y, and z'
21. Commit messages ▶ Describe why and the what “in a nutshell” ▶ Note to your future self (and to anyone else who you’re collaborating with)
22. Checking repository status git status
23. What did we do? git status git log
24. Make another change 1. Change file 2. Add changes 3. Commit changes 4. View updated log
25. Branches
26. Pull Request Let’s do one!
27. Fix conflicts
28. Saving temporary your changes git stash git stash happy
29. Moving a commit to another branch git cherry-pick
30. Merging branches git merge
31. Rebase vs Merge git merge vs git rebase
32. Squashing commits git rebase -i HEAD~2
33. Gracias! - @codies_latam - @codiescolombia - /LadiesAndCode