PY-1.4-BP3-MQ60

Our Goal: Add Your Work to the Main Game

In this lesson, you will finish the Pull Request process. This means you will take your new code and add it to the main game. You will click a special button to 'merge' your Pull Request. This will make your new feature part of the main game for everyone.

Get Ready to Merge

Before you merge your Pull Request, let's check a few things on GitHub:

  1. Go to your Pull Request page.
  2. Look for any messages about 'merge conflicts'. There should be none. This means your code can be added without problems.
  3. Go to the 'Conversation' tab. Make sure all the talks about your code are finished (resolved).
  4. If there are any checks (like tests), make sure they all passed.

If all these things are good, you are ready to merge!

Merge Your Pull Request

Now, you will merge your Pull Request. This is the final step to add your new code to the main game.

  1. On your Pull Request page, find the 'Merge pull request' button. It's usually a green button.
  2. Click the 'Merge pull request' button.
  3. GitHub might ask you to confirm. Click 'Confirm merge' if it does.

After this, your new code will be part of the main game!

Check Your Work Again

You've merged your Pull Request! Now, let's check to make sure your new code is in the main game.

What you should see:

āœ… Your Pull Request page should now say that it is 'Merged' or 'Closed'. āœ… Go to the 'main' branch of your game project on GitHub. You should see your new code there!

If you see these things, you successfully added your new feature to the main game!

Documentation

Documentation not available for PY-1.4-BP3.