Why workflow agreement matters in Git - See It in Action

Why Workflow Agreement Matters in Git

📖 Scenario: Imagine you and your friends are working together to write a story. If everyone writes their part in a different way, the story might get messy and confusing. In software projects, teams use Git workflows to keep things organized and clear.

🎯 Goal: Learn how to create a simple Git workflow agreement by setting up a shared branch and making commits in an agreed way. This helps everyone work smoothly without conflicts.

📋 What You'll Learn

Create a new Git repository

Create a branch called feature

Make a commit on the feature branch

Merge the feature branch into main following the agreed workflow

Display the commit history to confirm the workflow

💡 Why This Matters

🌍 Real World

Teams use Git workflows to coordinate work on software projects, making sure everyone knows where to add new features and how to combine changes safely.

💼 Career

Understanding Git workflows is essential for developers, testers, and DevOps engineers to collaborate effectively and maintain code quality.

1

Initialize Git repository and create main branch

Run git init to create a new Git repository and create a file called README.md with the text "Project Start". Then add and commit this file with the message "Initial commit on main".

Git

# Initialize Git repository and create README.md
# Your code here

Hint

Use git init to start the repository. Create the README.md file with echo. Then add and commit the file.

2

Create and switch to the feature branch

Create a new branch called feature using git branch feature and switch to it with git checkout feature.

Git

git init

echo "Project Start" > README.md

git add README.md

git commit -m "Initial commit on main"

# Create and switch to feature branch
# Your code here

Hint

Use git branch feature to create the branch and git checkout feature to switch to it.

3

Make a commit on the feature branch

On the feature branch, create a file called feature.txt with the text "New feature work". Add and commit this file with the message "Add feature work".

Git

git init

echo "Project Start" > README.md

git add README.md

git commit -m "Initial commit on main"

git branch feature

git checkout feature

# Create feature.txt and commit
# Your code here

Hint

Create the file with echo, then add and commit it with the correct message.

4

Merge feature branch into main and show commit history

Switch back to the main branch with git checkout main. Merge the feature branch using git merge feature. Finally, show the commit history with git log --oneline.

Git

git init

echo "Project Start" > README.md

git add README.md

git commit -m "Initial commit on main"

git branch feature

git checkout feature

echo "New feature work" > feature.txt

git add feature.txt

git commit -m "Add feature work"

git checkout main

# Merge feature branch and show history
# Your code here

Hint

Switch to main, merge feature, then use git log --oneline to see commits.

Practice

1. Why is having a workflow agreement important when using git in a team?

easy

A. It helps prevent conflicts and keeps the code organized.

B. It makes the code run faster on all machines.

C. It automatically fixes bugs in the code.

D. It allows unlimited access to the repository without rules.

Solution

1. Step 1: Understand the purpose of workflow agreement

   A workflow agreement sets clear rules for how team members use Git, helping avoid confusion.

2. Step 2: Identify the main benefit

   By following agreed rules, conflicts are reduced and code stays organized, improving teamwork.

3. Final Answer:

   It helps prevent conflicts and keeps the code organized. -> Option A

4. Quick Check:

   Workflow agreement = prevent conflicts and organize code [OK]

Hint: Workflow agreement = clear rules to avoid conflicts [OK]

Common Mistakes:

• Thinking workflow speeds up code execution
• Believing workflow fixes bugs automatically
• Assuming workflow removes access controls

2. Which of the following is the correct way to start a new branch following a team workflow?

easy

A. git branch -m feature/login

B. git checkout -b feature/login

C. git push origin feature/login

D. git merge feature/login

Solution

1. Step 1: Identify the command to create and switch to a new branch

   git checkout -b branch-name creates and switches to the new branch in one step.

2. Step 2: Check other options

   git branch -m renames a branch, git push uploads changes, and git merge combines branches.

3. Final Answer:

   git checkout -b feature/login -> Option B

4. Quick Check:

   Create and switch branch = git checkout -b [OK]

Hint: Create and switch branch with git checkout -b [OK]

Common Mistakes:

• Using git branch -m to create a branch
• Trying to push before creating the branch
• Merging before creating or switching branches

3. Given this team workflow: always pull before pushing. What will happen if you run these commands in order?

git push origin main
git pull origin main

medium

A. Pull will overwrite remote changes without warning.

B. Push will succeed even if remote has new commits.

C. Push and pull commands do nothing without commit.

D. Push will fail if remote has new commits; pull updates local branch.

Solution

1. Step 1: Understand push behavior when remote has new commits

   If remote has new commits, git push will be rejected to avoid overwriting others' work.

2. Step 2: Understand pull updates local branch

   git pull fetches and merges remote changes into local branch, updating it.

3. Final Answer:

   Push will fail if remote has new commits; pull updates local branch. -> Option D

4. Quick Check:

   Push fails if remote ahead; pull updates local [OK]

Hint: Always pull before push to avoid conflicts [OK]

Common Mistakes:

• Assuming push always succeeds
• Thinking pull overwrites remote
• Believing push/pull do nothing without commits

4. A team member forgot to pull before pushing and got this error:

! [rejected] main -> main (fetch first)

What should they do to fix this?

medium

A. Delete the local branch and create a new one.

B. Run git push --force to overwrite remote changes.

C. Run git pull origin main then resolve any conflicts before pushing again.

D. Ignore the error and try pushing again immediately.

Solution

1. Step 1: Understand the error meaning

   The error means remote has new commits; local branch is behind.

2. Step 2: Correct fix is to pull and merge changes

   Running git pull origin main updates local branch; conflicts can be resolved before pushing.

3. Final Answer:

   Run git pull origin main then resolve any conflicts before pushing again. -> Option C

4. Quick Check:

   Pull first to sync before push [OK]

Hint: Pull and fix conflicts before pushing [OK]

Common Mistakes:

• Using git push --force without caution
• Deleting branches unnecessarily
• Ignoring errors and retrying push

5. Your team agreed on a workflow where all feature branches must be reviewed before merging into main. Which Git command sequence best supports this workflow?

hard

A. Create feature branch, push to remote, open pull request, merge after approval.

B. Commit directly to main branch without branches or reviews.

C. Merge feature branch locally and push to main without review.

D. Delete main branch and work only on feature branches.

Solution

1. Step 1: Identify workflow steps for review

   Creating a feature branch and pushing it allows others to review changes before merging.

2. Step 2: Use pull requests for review and controlled merging

   Opening a pull request enables team review; merging happens only after approval.

3. Final Answer:

   Create feature branch, push to remote, open pull request, merge after approval. -> Option A

4. Quick Check:

   Feature branch + PR + review = safe merge [OK]

Hint: Use pull requests for review before merging [OK]

Common Mistakes:

• Committing directly to main branch
• Merging without review
• Deleting main branch accidentally