Objective

Welcome to Micro-Quest PY-1.4-BP1-MQ70: Integrating Your Work.

Our objective is to integrate the score limit feature developed on the feature/add-score-limit branch into the stable main branch using Git. After merging, we will run the game to confirm the feature is successfully integrated into the main version of the project.

This task focuses on a core Git workflow step: merging branches.

Check Spec

Before we merge, let's quickly verify our current state.

Use Git commands to confirm:

1. You are currently on the main branch.
2. The feature/add-score-limit branch exists locally.

This confirms we are starting from the correct point for the merge operation.

Implement

Now, let's perform the merge operation to bring the score limit feature into the main branch.

Remember the Git workflow: first switch to the branch you want to merge into, then execute the merge command specifying the branch you want to merge from.

Step by step checklist:

1. Ensure your current branch is main.
2. Merge the feature/add-score-limit branch into your current branch (main).

The following documentation sections are going to be helpful:

• Switching Branches (git checkout or git switch)
• Integrating Your Work (git merge)

Validate

With the merge complete, let's validate that the score limit feature is now present and working on the main branch.

1. Confirm you are still on the main branch using Git commands.
2. Run the game from the main branch.
3. Play the game and verify that the score limit functionality is active and works as expected.

Verification Results:

• ✅ Confirmed current branch is main.
• ✅ Ran the game from main and verified the score limit feature is working. All verification steps passed!