Scribd
Upload
9 views26 pages

CS161 Week 01 28 To 01 30 Part1

The document outlines the agenda for a CS 161 Software Products course in Spring 2025, detailing team tasks, project themes, and responsibilities. It presents two project options: a Kahoot style game and a storage data analysis project, along with resources for each. Additionally, it provides an overview of Git and GitHub, including commands like git pull and git fetch, and their differences in managing repository updates.

Uploaded by

Dheeraj Kumar
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
9 views26 pages

CS161 Week 01 28 To 01 30 Part1

The document outlines the agenda for a CS 161 Software Products course in Spring 2025, detailing team tasks, project themes, and responsibilities. It presents two project options: a Kahoot style game and a storage data analysis project, along with resources for each. Additionally, it provides an overview of Git and GitHub, including commands like git pull and git fetch, and their differences in managing repository updates.

Uploaded by

Dheeraj Kumar
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
You are on page 1/ 26

CS 161 Software

Products
Spring 2025
MH 225
Agenda
About Teams
Team Tasks For Thursday
Team Lead Responsibilities
SCRUM quick crash course
Project Theme
Option 1: Kahoot Style Game
Option 2: Scientific
Kahoot Samples
Kahoot Samples Continued.....
Samples at URL
Kahoot:
https://www.youtube.com/watch?v=pAfnia7-rMk

Quizlet:
https://www.youtube.com/watch?v=c0VkeDUeehE
Option 2: Storage Data Analysis
Storage Media Performance Analysis
• For this option, you will analyze a set of storage I/O activity data
and plot the results where there are different memory block
sizes, and data read and data write configurations are analyzed.
• You'll use Server Storage I/O Benchmark Performance Resource
Tools
Storage I/O Examples
Project Game Features
Source Code Management
What Is GitHub?
What is Git?
GitHub and Git
Let's Talk About GitHub
GitHub
Getting Started With A Repository
Creating A Branch
Commiting Files
Git Pull Requests

i.e. git pull

• Fetches and merges updates from the remote repository in one step.
• Keeps your branch in sync with the remote branch.
• Automatically attempts to merge changes, which can sometimes lead to
conflicts.
Git Fetch
• The Git Fetch command is used to fetch all changes from the remote
repository to the local repository.
• It doesn’t make any changes to the current working directory.
• It stores all the changes in a separate branch called the remote-tracking
branch.

NOTE:
git merge or git rebase command is used to merge these changes into our
current working directory.
Example Scenario
STEP 1: Create a local file
(readme.txt)

STEP 2: Assume a change was


made to a remote file (readme.txt);
not on the local repo

STEP 3: Run git fetch


STEP 4: Run git log (to check for any changes noticed from the remote branch)
STEP 5: need to use the git merge origin/<branch name> command to merge the changes
git pull vs git fetch
• The difference between git fetch and git pull lies in their scope of action. git fetch downloads
changes from a remote repository to your local repository, specifically into remote-tracking
branches, without modifying your working directory or local branches. It's a safe way to preview
changes before integrating them.
• On the other hand, git pull is a compound command that combines git fetch and git merge (or git
rebase, depending on configuration). It not only downloads changes but also automatically
integrates them into your current branch. This makes it a convenient shortcut but can also lead to
conflicts if not handled carefully.
• In essence, git fetch is about retrieving information, while git pull is about updating and integrating. If
you want to review changes before applying them, git fetch is the way to go. If you're confident in
directly integrating changes, git pull offers a quicker approach.

You might also like