Introduction to git
- 2. Version Control with Git • What do you do when you want to recover past versions of a file?
- 3. Version Control with Git .. Cntd •Using Git, • You can easily view the history of your source code. • Track difference between different versions of your files. • Git will prevent an unintentional overwrites.
- 4. Popular Version Control Systems • Client-server model – Developers use a shared single repository • Subversion (SVN) • Visual Studio Team Services (VSTS) • Distributed model- Each developer works directly with his or her own local repository, and changes are shared between repositories as a separate step • Bazaar • Git
- 5. What is GitHub? • A Web-Based Git Repository hosting service, that offers all of the distributed revision control and source code management functionalities It allows you to: • Share your repositories with others • Access other user’s repositories • Store remote copies of your repositories
- 6. Repository to Control History • Remote Repository: Resides on a remote server that is shared among team members. (e.g.- GitHub) • Local Repository: Resides on a local machine of an individual user. • You can either create a brand new repository or from scratch or by cloning an existing remote repository onto your local machine.
- 7. Commits • Enables you to record changes that were made to a file or directory. • You can view all changes chronologically in the respective file or directory. • It is easy to team members to understand why and how changes were made. • Provide a descriptive commit message regarding the changes you have made.
- 8. Installing Git • Windows: git-scm.com/download/win • Mac: git-scm.com/mac • Linux: sudo apt-get install git (Ubuntu) or sudo yum install git (Fedora) Once installed check Git Version: git --version
- 9. Default Settings • Your Identity • Enable Color in git
- 10. Create a new Repository • Initialize the local directory as a Git repository
- 11. Create a new Repository .. Cntd • Add & Commit • Commit Changes
- 12. Push a remote Repository • Allows us to share our changes with other members in the team. ✓Push To sharing our changes with others, we have to push them to remote repository.This will cause the remote repository to update and synchronized with out local repository.
- 13. Push a remote Repository .. Cntd • Add the URL for the remote repository • Push the changes from your local repository to GitHub
- 14. Origin • A name for the remote repository that a project was originally cloned from. • Not required to name the remote repository Origin
- 15. Clone a remote Repository ✓Clone Copy a remote repository to local machine
- 16. Pull from a remote Repository • Synchronized local repository with the newly updated remote repository
- 17. What’s a Branch? • Independent line of development. • Enables you to isolate your work from others. • Easily merge the versions later on.
- 18. Branch .. Cntd • Create a new branch • Switch to different branch
- 19. Merge Branches • Combine two branches. • Checkout the branch you want to update. • Execute the merge
- 20. Merge Conflict • Occurs when, two or more members make changes on the same part of a file in the two different branches. • Git unable to resolve the merge conflicts. • We have to manually fix them.
- 21. Resolve a Conflict • Delete the conflict markers <<<<<<<, =======, >>>>>>> and make the changes you want in the final merge.
- 22. Resolve merge conflict from terminal • Run the following commands in your terminal git config merge.tool vimdiff git config merge.conflictstyle diff3 git config mergetool.prompt false git mergetool • Vimdiff display
- 23. More .. • Delete a branch • View all the available branches • Examine the repository history
- 24. References • https://guides.github.com/introduction/flow/ • https://en.wikipedia.org/wiki/List_of_version_control_software • https://backlog.com/git-tutorial/ • https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts- in-git • https://help.github.com/articles/resolving-a-merge-conflict-using-the- command-line/ • https://stackoverflow.com/questions/13321556/difference-between-git-and- github