CS122B: Projects in Databases and Web Applications Winter 2018 Notes 3: Git Professor Chen Li UC Irvine Prepared by Avinash Kumar

Version control Jorge Cham, PHD Comics, http://www.phdcomics.com/comics/archive. php?comicid=1531

Version control We can use Git to save each version and go back and forth between versions. Version 1 Version 2 Version 3 Document.txt Adapted from: Software Carpentry, "Version Control with Git", http://swcarpentry.github.io/git-novice/01-basics/

History of version control CVS Subversion Git … https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control

Version control in Git Team members change code on their local machines and push the changes to the Github server. Other team members can pull the changes from the server and continue to work. Therefore, the entire version history of all the files are replicated among all the team members. https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control

Branches in Git Recommendations branch Branches are generally used to separately develop a feature piece-wise and later merge the complete code into the master branch. The circles below represent commits (think of a commit as a snapshot of the files in the repository.) master (all website’s code) Recommendations branch (for building recommendation feature) Top deals branch (for showing the top deals today)