Build & submit taskBetabeginner

Merge Two Teammates' Work

Bring two teammates' branches into main: one merges cleanly, the other conflicts in two files. Resolve the conflicts so nobody's work is lost, finish with real merge commits, and delete the merged branches. A local self-check verifies the history and the resolved files and writes your submission for instant, rubric-based feedback.

35 min

Est. time

Outcomes

Rubric criteria

60%

Pass score

What you'll learn

Skills you'll have real reps in after shipping this.

Git merges changes to different lines on its own and stops only where both sides changed the same lines.

Resolving a conflict means writing the version the project needs, which is often a combination of both sides.

git add marks a conflict resolved, and the commit that finishes the merge records the decision.

The scenario

Bean There, a small coffee shop, keeps its website in Git. Two teammates finished their work on branches: Priya added a page for the cakes on priya/cakes, and Alex added a chai latte for the autumn on alex/seasonal.

While they worked, Sam added mint tea on main, in the same spots of the menu and the price list where Alex added the chai latte. The shop wants everything on the site: the cakes page, the chai latte and the mint tea.

Your role

You are the teammate who merges. Your deliverable is a main branch that contains both branches through merge commits, a menu and a price list that keep both new teas with their prices, no conflict markers anywhere, no leftover branches, and a short note on what conflicted and how you decided.

Start the task to unlock the full brief

You'll get the step-by-step requirements, setup commands, the 5-criterion grading rubric, tips, and the ability to submit your solution for instant AI grading.

Free to start · submit when you're ready

Learning resources

git merge documentation (how conflicts are presented)

git-scm.com

Pro Git: Basic Branching and Merging

git-scm.com

git branch documentation

git-scm.com

Practise merge conflicts on a real team history

Merge conflicts are easier the second time, so this kit gives you a safe first one. A small coffee shop's repository has two teammates' branches waiting: one merges cleanly, the other changed the same lines as the main branch in two files. You merge both, read the conflict markers, write the version that keeps everyone's work, finish the merge with a commit and tidy up the branches. A local self-check reads your history and the resolved files and writes your submission only when everything genuinely passes. It is the Level 2 project in Preporato's Git course.

Frequently asked questions

Do I need GitHub or a team for this project?

No. The kit builds a repository on your computer with the teammates' branches already in it, written by fixed authors so the history looks like real teamwork. You need Git and a terminal (Git Bash on Windows).

Can I use VS Code or a merge tool to resolve the conflicts?

Yes. Any editor or git mergetool works. What counts is the result: both teas kept with their prices, no markers left, and the merge finished with a commit. Delete any .orig backup files a merge tool leaves behind before running check.sh.

What if I get the resolution wrong?

Before you commit, git merge --abort puts everything back. After, run bash setup.sh to get a fresh repository and try again; check.sh tells you exactly which check failed.