University:
Boston University
Course:
CAS CS 501 | Computer Science Practicum
Academic year:

2024
Views:

209

Pages:

17
Author:

Triston Franco

Git for version control and collaboration Outline - - Motivation Using Git for version control Collaboration using Git GitHub and other remote repositories 2 Remote repository To publish repository to a GitHub (or other place): 1. Create a repository in GitHub 2. In your working directory run: git remote add origin https://github.com//.git git push -u origin master 3 Collaboration Create 2 directories - repo1 and repo2. In the first directory create a repo job_example mkdir repo1 mkdir repo2 cd repo1 git init job_example cd job_example 4 Collaboration In the first directory (repo1/job_example) add a few file and make a commit. You can copy the file from the examples directory: cp /project/scv/examples/git/job_example/* . Make an initial commit: git add . git commit -m "Initial commit" 5 Collaboration Create a remote repository on GitHub. We will be updating this repository from 2 different directories we created. 6 Collaboration # In repo1: git remote add origin https://github.com//job_example.git git push -u origin master # In repo2: https://github.com/katgit/job_example.git cd job_example # To differentiate between 2 repositories, let’s change a local user-name git config --local user.name "Some Alias" 7 Collaboration # In repo2 modify job.qsub git add job.qsub git commit –m "modified job.qsub" # Update Git Hub repository git push origin master # In repo1: git pull origin master 8 Resolving Conflicts # In repo1 further modify job.qsub and then commit it git add job.qsub git commit –m "added project flag to job.qsub" # Update Git Hub repository git push origin master 9 Resolving Conflicts # In repo2 modify example.py file and then commit it git add example.py git commit –m "added some calculations to example.py" # Now try to push the changes to the GitHub repo: git push origin master ! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/katgit/job_example.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. 10 Resolving Conflicts # In the repo where you got this errors (repo2) pull the updates from GitHub: git pull origin master If 2 different files were modified, git will resolve the conflict and will open an editor to record a commit message # Update Git Hub repository git push origin master 11 Branch g f d e c b Git allows and encourages you to have multiple local branches that can be entirely independent of each other. dev a master 12 Branch g f d e Check all existing branches git branch c b dev or git branch --list a master 13 Branch g f d e Create a new branch "dev" git branch dev c b dev Check existing branches git branch --list a master Note: Creating a new branch does not make it current! 14 Branch g f d e Switch to a new "dev" branch git checkout dev c b dev Check existing branches git branch --list a master 15 Branch Checkout g f d e c b a dev Use checkout verb to switch between branches, i.e: git checkout Each branch can be modified independently master 16 Merging Branches g f d e First checkout to the "receiving" branch: git checkout master c b dev Perform merge with the other branch git merge dev a master 17