Understanding GIT and Version Control
Download as PPTX, PDF•0 likes•1,868 views
A version control system stores and manages every revision of files and code, allowing developers to collaborate, manage releases, and rollback to previous versions when bugs are found. Git is a widely used version control system developed by Linus Torvalds that offers benefits like backups, synchronization, undo functionality, tracking changes and ownership. It works by having a repository that stores files, which users can check out, edit, and check back in with a commit message.
![Git Commands
15
1. Initializing a Git Repository
2.
git init
Repository Status
git status
3.Adding files to Repository
git add file [file] [file..]](https://image.slidesharecdn.com/gitrepo-191003071449/85/Understanding-GIT-and-Version-Control-15-320.jpg)
![Checking the difference on conflict
19
git diff
git revert HEAD
Reverting the version
Git pull
git checkout -b [name_of_your_new_branch]
git push origin [name_of_your_new_branch]
Create a branch
git branch -a
View all branches](https://image.slidesharecdn.com/gitrepo-191003071449/85/Understanding-GIT-and-Version-Control-19-320.jpg)
![Add remote to your branch
20
git remote add [name_of_your_remote] [name_of_your_new_branch]
git push --set-upstream origin branch_name
Push changes from your commit into your branch :
Git add .
git commit –m “message”
git push --set-upstream origin branch_name
Then Add commit and push
git branch -a
View all branches](https://image.slidesharecdn.com/gitrepo-191003071449/85/Understanding-GIT-and-Version-Control-20-320.jpg)
![Update your branch when the original branch from official
repository has been updated
21
git fetch [name_of_your_remote]
Then you need to apply to merge changes if your branch is
Git checkout master
git merge [name_of_your_branch]](https://image.slidesharecdn.com/gitrepo-191003071449/85/Understanding-GIT-and-Version-Control-21-320.jpg)
Understanding GIT and Version Control
- 2. Why?
- 3. Why?
- 5. Getting Started A version control system is a special application that stores and manages every revision of your files and code. Many developers and organizations use version control to collaborate on source code, manage releases, and roll back to previous versions when bugs are discovered. 5
- 6. VCS 6
- 7. Benefits 7 •Backup and Restore •Synchronization •Short-term undo •Long-term undo •Track Changes •Track Ownership •Sandboxing •Branching and •merging
- 8. Installation & Setup 8 1. Git is a versioning system developed by Linus Torvalds, that is used by millions of users around the globe. Companies like GitHub offer code hosting services based on Git. 2. Run your own Git server 3. Git Client 4. https://git-scm.com/downloads
- 9. 9 Basic Setup Repository (repo): The database storing the files. Server: The computer storing the repo. Client: The computer connecting to the repo. Working Set/Working Copy: Your local directory of files, where you make changes. Trunk/Main: The primary location for code in the repo. Think of code as a family tree — the trunk is the main line.
- 10. Features 10 Add: Put a file into the repo for the first time, i.e. begin tracking it with Version Control. Revision: What version a file is on (v1, v2, v3, etc.). Head: The latest revision in the repo. Check out: Download a file from the repo. Check in: Upload a file to the repository (if it has changed). The file gets a new revision number, and people can “check out” the latest one. Checkin Message: A short message describing what was changed. Changelog/History: A list of changes made to a file since it was created.
- 11. 11 Update/Sync: Synchronize your files with the latest from the repository. This lets you grab the latest revisions of all files. Revert Throw away your local changes and reload the latest version from the repository Branch: Create a separate copy of a file/folder for private use (bug fixing, testing, etc). Branch is both a verb (“branch the code”) and a noun (“Which branch is it in?”)
- 12. 12 Diff/Change/Delta: Finding the differences between two files. Useful for seeing what changed between revisions. Merge (or patch): Apply the changes from one file to another, to bring it up-to-date. For example, you can merge features from one branch into another. Conflict: When pending changes to a file contradict each other (both changes cannot be applied).
- 13. 13 Resolve: Fixing the changes that contradict each other and checking in the correct version. Locking: Taking control of a file so nobody else can edit it until you unlock it. Some version control systems use this to avoid conflicts. Breaking the lock: Forcibly unlocking a file so you can edit it. It may be needed if someone locks a file and goes on vacation (or “calls in sick” the day Halo 3 comes out). Check out for edit: Checking out an “editable” version of a file. Some VCSes have editable files by default, others require an explicit command.
- 14. 14
- 15. Git Commands 15 1. Initializing a Git Repository 2. git init Repository Status git status 3.Adding files to Repository git add file [file] [file..]
- 16. Git Commands 16 4.Committing Staged Files 5. git commit -m ‘Initial Commit’ Pushing to repository git push 6.Check status git status
- 17. Uploading the content to github 17 git remote add origin remote url.git git push origin master Cloning the repository git clone remote url.git
- 18. 18
- 19. Checking the difference on conflict 19 git diff git revert HEAD Reverting the version Git pull git checkout -b [name_of_your_new_branch] git push origin [name_of_your_new_branch] Create a branch git branch -a View all branches
- 20. Add remote to your branch 20 git remote add [name_of_your_remote] [name_of_your_new_branch] git push --set-upstream origin branch_name Push changes from your commit into your branch : Git add . git commit –m “message” git push --set-upstream origin branch_name Then Add commit and push git branch -a View all branches
- 21. Update your branch when the original branch from official repository has been updated 21 git fetch [name_of_your_remote] Then you need to apply to merge changes if your branch is Git checkout master git merge [name_of_your_branch]
- 22. Thanks