Version Control Group Wen-hao Zeng Richard Liou

2 Introduction Several groups develop the ITS concurrently Accumulated modification of files can cause confusion in future Resolve conflicts Local development Git is chosen as the solution

3 What have we achieved Successful installation of Git on Dev5 server Implemented the repository structure on Dev5 server. Implemented remote operation procedures Git tutorial

4 How we coordinate A team meeting is conducted every Wednesday to discuss the current progress and the plan for the coming week. A thread on Piazza is used to record major progress. s are frequently used for communication between group members.

5 Early Efforts Local installation, commit, and branching Dev5 installation Remote testing with root –A repository under html/docs was used –Initially included ITS_FILES folder –Discovered problems of pushing operation

6 The First Implementation A working model that is intuitive –Simple repository structure –Few commands needed Less control for each individual –Each team shares a branch –Individual changes are equivalent to team’s changes

7 Dev5 Repository Structure Located under /var/www/html –Does not include ITS_FILES folder in order to save space –Approximately 350 Mb Four branches –One for each team MonTag MonQuestion ThuDatamine –Master branch - current stable version

8 Remote Implementation To fully utilize the advantage of Git branching functionality, three branches are created for each group. Each group will push to their own branch. The first implementation –Merging to master branch controlled by version control group –Continuous group branches –Why it doesn’t work

9 Remote Implementation The second implementation involves the following steps: 1.Pull from remote master to get most up-to-date version. 2.Modify changes on local machine. 3.Delete existing team branch. 4.Push changes on local machine to a newly created team branch. 5.Merge team branch with master whenever team has finalized changes.

10 Remote Implementation (cont.) Example: MonTag decides to merge into master. ThuDatamine MonTag MonQuestion Master HEAD

11 Remote Implementation (cont.) Post-merge: ThuDatamine MonTag MonQuestion Master HEAD

12 Remote Implementation (cont.) Now MonQuestion updates its branch. ThuDatamine MonTag MonQuestion Master HEAD MonQuestion Master HEAD

13 Remote Implementation (cont.) After many cycles… MonTag MonQuestion ThuDatamine Master HEAD

14 Greg’s Implementation In order to give individuals more freedom, Greg implemented a new repository structure. –Each individual has his/her own repository on Dev5 server. –A bare repository is created on Dev5 for better working directory management.

15 New Repository Structure /opt/git User 1 User 2 Push Clone User 1 User 2 Master dev

16 Cooperation Git tutorial thread on Piazza is used to introduce Git to other group. –Step-by-step tutorial –Concentrated command-only version –Command line cheat sheet Troubleshooting thread

17 Cooperation

18 Future Works Creating hooks for simplified command multiple convenient functions Improve Git tutorial and documentations

19 Questions