Download to read offline
Uploaded byChris Mylonas
Source Control Using Git
The document provides an overview of version control systems with a focus on Git, detailing its centralized and distributed models, key concepts, and functionalities. It explains the importance of version control in collaboration, highlights the differences between centralized and distributed systems, and outlines essential Git commands and workflows. Additionally, it discusses branching, remote repositories, and resources for further learning.
More Related Content
Similar to Source Control Using Git
Source Control Using Git
- 1. Version Control UsingGit Christos Mylonas Senior Software Engineer Viva Wallet
- 2. Agenda • Version Control •Git Concepts • Local & Remote Repositories • Branching • Lab
- 3.
- 4. What is versioncontrol? • A system that keeps changes to files over time • Allows collaboration • View WHAT has been changed • View WHO has made the changes • Undoing • Revert to prior version
- 5. What about filecopies? • Multiple directories • Who made what? hmm? • Sync • Compare
- 6. What about filecopies?
- 7. Centralized Version Control •Everything is stored on a server. • Checkout -> Edit -> Commit • Linear development by design • TFS (<2013), SVN, Perforce, SourceSafe (legendary)
- 8. Centralized Version Control Pros •Monitoring • Administration • Avoid conflicts by design • Easy to understand Cons • Single User Editing • Single Point of Failure • Requires Connectivity • Repository on Server
- 9.
- 10. Distributed Version Control •No central server. • All peers have the repository • Git • TFS (>2013)
- 11. Distributed Version Control Pros •Repository mirror • Multiple workflows • Non linear development • Peers • Edit the same files • Working alone - offline Cons • Difficult to master
- 12.
- 13. git • Linux -Linus Torvalds (~2005) • Bitkeeper fork • Goals: Speed, Branches, Distributed • File based : Everything exist locally • Git stores snapshots not differences • No network required (but we can do almost everything) • SHA-1 hash : integrity + naming things • command line, full clients, libraries
- 14.
- 15.
- 16.
- 17.
- 18. .git repo objects •a content-addressable file system • tree • commit • blob • tag
- 19.
- 20.
- 21. Files Files are: Tracked, Untrackedor Ignored .gitignore Files are in state: Modified Staged Committed
- 22. Configuration • name • email •git config --global
- 23. Branches • diverging • non-lineardevelopment
- 24. Repositories • Local (.gitdirectory) • Remotes (https, ssh) • On premises • github.com / bitbucket.org
- 25.
- 26. Creating • .git init •.git directory creation
- 27.
- 28. Making Changes • thefile lifecycle • staging • unstaging • git add filename • git add *
- 29. Viewing Status • currentstatus • history • git status • git log
- 30. Commiting • use shortdescriptive messages • history • git commit –m ‘message’
- 31. Undoing • amending commits: git commit -amend • unstage file : git reset HEAD filename • unmodifying a modified file: git checkout -- filename
- 32.
- 33. What is branching •diverting from the main line • do some work • merge back • have multiple branches at the same time • switch between branches
- 34. Default branches • master •develop
- 35. Create new branch •Have clean working state • Changes files on your working directory. • git branch branchname
- 36. Switch to branch •git checkout branchname
- 37.
- 38.
- 39.
- 40.
- 41.
- 42.
- 43. Remote Repositories • Viewing •Adding new remotes • Fetch / Pull from remotes • Pushing to remotes • Pull requests
- 44.
- 45.
- 46.
- 47. Pull requests onremote
- 48.
- 49. Remote Branches • origin/{branch} •pulling • pushing
- 50.
- 51.
- 52.
- 53. Resources • https://git-scm.com/ • https://about.gitlab.com/features/ •http://rogerdudler.github.io/git-guide/ • http://danielkummer.github.io/git-flow-cheatsheet/ • http://stackoverflow.com/questions/tagged/git • https://github.com/github/gitignore
- 54.
- 55.
- 56. Lab – Check#presentation channel feel free to ask anything master develop aliceFeature bobFeature origin/master origin/develop remote repo `