Version Control with Git & GitHub
1 like168 views
The document provides an overview of version control with Git and GitHub. It discusses what version control is, how to set up a Git repository, save changes, view history, undo changes, distribute the repository, structure text for collaboration, and how GitHub enables additional collaboration features beyond basic version control. The document uses examples to demonstrate key Git commands for setting up and using a local repository that is synced to a remote GitHub repository.
Version Control with Git & GitHub
- 1. Version Control with Git & GitHub Piet Cordemans Nico De Witte
- 2. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 3. Version control manages changes to a set of code/files over time
- 4. Babbel1996 (https://commons.wikimedia.org/wiki/File:Tardis_BBC_Television_Center.jpg), „Tardis BBC Television Center“, CC BY 2.5 Version control allows you to jump back and forth through the history of a set of files, even exploring alternative timelines
- 5. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 6. Repository
- 10. Tell git who you are > git config --global user.name "Firstname Lastname" > git config --global user.email "name@example.com"
- 11. Set up Repository > git init
- 12. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 14. Each node is called a commit Who? When? Why? What? Author: Chuck Norris Date: Thu Feb 28 15:52:55 2019 Message: Chuck Norris only tests in production Added: prod/test Removed: staging/test
- 15. Working Copy Staging area Repository git add git commit
- 16. What is the current state? > git status
- 17. Saving your changes > git commit -m"describe what is committed in this message" > git add .
- 18. .gitignore Things you want to ignore * Build artefacts * Binaries * Your mother-in-law
- 19. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 20. Could you give me an overview? > git log
- 21. What has changed? > git diff
- 22. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 23. What if I forgot something to commit? > git commit --amend
- 24. What if I didn't want to stage a file? > git reset HEAD {{filename}}
- 25. What if I want to unmodify a file? > git checkout --{{filename}}
- 26. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 27. Local Remote
- 29. Adding a remote > git remote add origin https://github.com/pcordemans/ChuckNorrisFacts Local Remote
- 30. Local Remote Pushing to a remote > git push origin master
- 31. Where was that remote again? > git remote -v
- 32. Cloning a repository > git clone https://github.com/pcordemans/ChuckNorrisFacts Local Remote
- 33. Retrieving the latest changes Local Remote > git pull
- 34. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 36. Let's talk about Markdown # This is Markdown We love Git and GitHub <h1>This is HTML</h1> <p>We love Git and GitHub</p>
- 37. Actually, Markdown is extensively used by GitHub
- 38. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 39. Merge conflict: Rather sooner than later, you will change something, somebody has also changed
- 40. History is a graph
- 43. The current branch a.k.a. HEAD master HEAD
- 44. Jumping from one commit to another WARNING: don't try to commit changes master HEAD master> git checkout {{hash of the commit}}
- 45. Creating a new branch and jumping to it master> git checkout -b dev master HEAD Before After master HEAD dev
- 46. Committing to the new branch dev> git commit -m"this message explains everything" master HEAD dev
- 47. Fast forwarding the master branch Before After master HEAD dev masterHEAD dev dev> git checkout master master> git merge dev
- 48. Actual branching master HEAD devBefore After master HEAD dev dev> git checkout master master> git commit -m"descriptive message"
- 49. Merging Before After master HEAD dev master HEADdev master> git merge dev
- 50. Resolving merge conflicts: Make a new commit after you figured out what to keep and what to delete
- 54. What is Version Control? Setting up a repository Saving changes Looking at history Undoing changes Distributing the repository Structuring text Collaboration Beyond GitHub
- 55. GitHub is more than hosting remote git repositories Project management Collaboration Education Integration Sharing Security
- 56. Integration example Netlify is website deployment service, which deploys a website from a repository
- 58. IoT-Incubator.be Research - Prototyping - Training Contact us Research and education | Internet of Things VIVES University of Applied Sciences | Industrial Sciences and Technology Spoorwegstraat 12 | 8200 Brugge | BELGIUM piet.cordemans@vives.be | IoT-Incubator.be
- 59. LoRa Academy Internet of Things: Mbed Cisco Academy o CCNA o Cybersecurity Operations Ethical hacking Training courses App development o NativeScript o Node.js DevOps Wireshark https://www.vives.be/nl/navormingen-ict