An intro to git
1 like•97 views
The document introduces the version control system Git. It discusses that Git allows for multiple backups, parallel work, and easy feature switching. Some common misconceptions about Git are that it is too hard to use, only command line based, and not suitable for large projects. The typical Git workflow involves adding files, staging changes, committing snapshots, and pushing commits to a remote server or pulling other changes. Branches allow parallel development without affecting the main project code. Common Git commands are demonstrated including clone/init, add, commit, push/pull, checkout, merge, and reset.
An intro to git
- 1. An intro to GIT Orlando Code Camp 2017
- 2. Misnomers about GIT? ● It's too hard to use. ● It's only command line based. ● My project is too big and complicated for that. ● Takes too long to use.
- 3. Why use this tool? ● Multiple backups fast ● Work in parallel on the same file ● Develop features in different ‘versions’ or branches ● Fast rollback and feature switching ● It’s a skill in high demand
- 4. My Path to Version Control ● Lots of information. ● What’s the ‘best’? ● How do I do ‘X’? ● GIT, SVN, etc? ● What do I want out of version control?
- 7. Tool that we’ll use
- 9. Clone/ Init Creates a new repo or copies an existing one You can always add ‘remotes’ but it's easier to start from there.
- 10. Typical Workflow Add Stage Commit Push Pull remote
- 11. Add Tells GIT to start tracking the files. Ignore allows you to not track files in a folder - compiled files or temp files typically. Add
- 12. Stage Lets you get your commit where you want it. TIP: You can split your changes into multiple commits for tracking. Stage
- 13. Commit Snapshot in time of your project. Be detailed on your descriptions. You’ll thank yourself later and so will the other contributors to the project. Commit
- 14. Commit Commit
- 15. push Sends your commits to a centralized server. Note: there are different types of workflows. We are referencing the ‘centralized’ workflow. Push
- 16. Remote A place where your code is hosted. remote
- 17. Pull Brings changes committed to the remote into your branch. Pull
- 18. Workflow Once More Add Stage Commit Push Pull remote
- 19. Branches!
- 20. Branch A place to work which does not affect the main project. Develop Master You can name your branches whatever you want.
- 21. This is now the current branch Checkout Switches the branch you are on. Develop Master
- 22. Merge Brings a branch into another. Be cautious of conflicts. Develop Master Merge happens on this commit
- 23. Reset Lets you move around in time on your project. Really useful when looking for bug introductions. Reset to here v1.0 v1.1 v1.2 v1.3
- 24. GIT Flow Workflow v1.0 v1.1 v1.2 Hotfix Develop Feature Release Master
- 25. Appendix ● https://www.atlassian.com ● http://www.mnu.edu/business/software-skills-demand ● https://xkcd.com/1296/ ● https://xkcd.com/1597/ ● http://danielkummer.github.io/git-flow-cheatsheet/ ● https://training.github.com/classes/essentials/ ● https://www.gitlab.com/ ● https://github.com/ ● https://www.sourcetreeapp.com/
- 26. About Me I've been dabbling with code since the late 90's and currently work with Microsoft Business Intelligence products. When given the chance, I write single page applications in JavaScript. I'm also a stickler for automating as much of the day to day tasks as I can. When I'm not coding I enjoy camping and hanging out with my wife and sons. Email: [email protected]