Version control concept (Git) in Intro to Computing - Draw & Build Visually

Draw This - beginner

Draw a flowchart that shows the basic workflow of using Git for version control: starting from making changes to files, staging the changes, committing them, and pushing to a remote repository.

10 minutes

Hint 1

Hint 2

Hint 3

Hint 4

Hint 5

Grading Criteria

Start and End oval symbols present

Rectangles used for actions: Edit files, Stage changes, Commit changes, Push to remote

Decision diamond used to check if changes exist

Arrows correctly show the flow between steps

Flow logically represents the Git workflow steps

Solution

                        +----------+
                        |  Start   |
                        +----------+
                              |
                              v
                        +-------------+
                        | Edit files  |
                        +-------------+
                              |
                              v
                        +----------+
                        | Changes? |
                        +----------+
                       /           \
                     Yes            No
                      |              |
                      v              v
                +---------------+   +----------+
                | Stage changes |   |  End     |
                +---------------+   +----------+
                      |
                      v
                +---------------+
                | Commit changes|
                +---------------+
                      |
                      v
                +---------------+
                | Push to remote|
                +---------------+
                      |
                      v
                    +----------+
                    |   End    |
                    +----------+

This flowchart shows the basic steps in using Git for version control:

• Start: Begin the process.
• Edit files: Make changes to your project files.
• Check if changes exist: Decide if there are any changes to save.
• Stage changes: Prepare the changed files to be saved.
• Commit changes: Save the staged changes with a message describing them.
• Push to remote: Upload your commits to a shared repository so others can see them.
• End: The process is complete.

The decision diamond checks if there are changes to commit. If no changes exist, the process can end or wait for new edits.

Variations - 2 Challenges

[intermediate] Draw a flowchart for the Git workflow including branching: create a branch, switch to it, make changes, commit, and merge back to main branch.

[advanced] Draw a detailed flowchart showing Git workflow with resolving merge conflicts after merging branches.

Practice

1. What is the main purpose of using version control systems like Git?

easy

A. To speed up the computer's processor

B. To create graphics and animations

C. To delete old files automatically

D. To save and track changes to files over time

Solution

1. Step 1: Understand version control basics

   Version control systems keep a history of changes made to files, allowing users to track and manage edits.

2. Step 2: Compare options to purpose

   Only To save and track changes to files over time describes saving and tracking changes, which matches the main purpose of Git.

3. Final Answer:

   To save and track changes to files over time -> Option D

4. Quick Check:

   Version control = save and track changes [OK]

Hint: Version control = saving drafts of your work [OK]

Common Mistakes:

• Confusing version control with speeding up hardware
• Thinking it deletes files automatically
• Assuming it creates graphics

2. Which Git command is used to start a new repository in your project folder?

easy

A. git init

B. git commit

C. git add

D. git push

Solution

1. Step 1: Identify command purpose

   git init creates a new Git repository in the current folder, starting version control.

2. Step 2: Check other commands

   git add stages files, git commit saves changes, and git push sends changes to a remote repository.

3. Final Answer:

   git init -> Option A

4. Quick Check:

   Start repo = git init [OK]

Hint: Initialize repo with git init command [OK]

Common Mistakes:

• Using git add to start a repo
• Confusing git commit with git init
• Thinking git push starts a repo

3. What will happen after running these commands in order?

git init
git add file.txt
git commit -m "First commit"

medium

A. file.txt is ignored by Git

B. A new repository is created and file.txt is saved in the first commit

C. The repository is deleted

D. file.txt is deleted from the folder

Solution

1. Step 1: Analyze each command

   git init creates a new repo, git add file.txt stages the file, and git commit saves the staged file as a commit.

2. Step 2: Understand the result

   The file is saved in the repository history as the first commit; nothing is deleted or ignored.

3. Final Answer:

   A new repository is created and file.txt is saved in the first commit -> Option B

4. Quick Check:

   Init + add + commit = save file in repo [OK]

Hint: Init, add, commit = save file snapshot [OK]

Common Mistakes:

• Thinking commit deletes files
• Confusing add with delete
• Assuming file is ignored automatically

4. You ran git commit -m "Update" but got an error saying "nothing to commit". What is the likely cause?

medium

A. You did not stage any files with git add

B. You forgot to run git init

C. You typed the commit message incorrectly

D. Your files are deleted

Solution

1. Step 1: Understand the error message

   "Nothing to commit" means Git sees no changes staged to save.

2. Step 2: Identify missing step

   Before committing, files must be staged with git add. Without staging, commit has nothing to save.

3. Final Answer:

   You did not stage any files with git add -> Option A

4. Quick Check:

   Commit needs staged files [OK]

Hint: Stage files with git add before commit [OK]

Common Mistakes:

• Skipping git add before commit
• Assuming commit message typo causes this error
• Thinking files are deleted

5. You want to save changes to two files, index.html and style.css, but only index.html should be included in the commit. Which sequence of commands achieves this?

hard

A. git commit -m "Update index"

B. git add .
git commit -m "Update index"

C. git add index.html
git commit -m "Update index"

D. git add style.css
git commit -m "Update index"

Solution

1. Step 1: Stage only the desired file

   Using git add index.html stages only that file, excluding others.

2. Step 2: Commit staged changes

   git commit -m "Update index" saves only the staged index.html changes.

3. Final Answer:

   git add index.html git commit -m "Update index" -> Option C

4. Quick Check:

   Stage specific file, then commit [OK]

Hint: Add only files you want before commit [OK]

Common Mistakes:

• Using git add . to stage all files
• Committing without staging
• Adding wrong file by mistake