Branching and pull requests

Branching and pull requests#

Let’s practice branching and pull requests with a crossword puzzle

Task 1.1 Open this assignment in GitHub#

You’re advised to do this assignment on GitHub so that you don’t have to deal with pushing and pulling. Therefore, open this file in your personal repository which was created from the GitHub Classroom link. However, you could also do these steps locally.

Task 1.2 Edit crossword#

Fill in some words replacing the - in this file crossword.md.

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠🔢

🔠
🔢

(1) -

🔠
🔢

-

🔠
🔢

-

🔠
🔢

-

🔠
🔢

(2) -

-

🔠
🔢

(3) -

(4) -

(5) -

-

-

🔠
🔢

-

-

-

-

-

🔠
🔢

-

-

-

-

(6) -

-

🔠
🔢

-

-

(7) -

-

-

(8) -

-

-

🔠
🔢

-

-

-

(9) -

-

-

-

-

-

-

-

-

-

-

🔠
🔢

(10) -

-

-

-

-

-

-

-

-

-

-

-

-

-

🔠
🔢

-

-

-

-

(11) -

-

-

-

🔠
🔢

-

-

-

-

-

-

(12)-

-

-

-

🔠
🔢

-

-

-

-

-

-

-

-

🔠
🔢

(13) -

-

-

-

(14) -

-

-

-

-

-

-

-

(15) -

-

-

-

-

🔠
🔢

-

-

-

-

(16) -

-

-

-

-

-

-

-

-

🔠
🔢

-

-

(17) -

-

-

-

-

-

-

-

🔠
🔢

-

-

-

-

🔠
🔢

-

-

(18) -

-

🔠
🔢

-

(19) -

(20) -

-

-

-

-

-

-

-

-

(21) -

-

-

-

-

-

🔠
🔢

-

-

-

-

-

(22) -

-

🔠
🔢

-

-

-

-

(23) -

-

-

-

-

-

-

-

-

-

-

🔠
🔢

-

-

-

-

-

-

-

🔠
🔢

-

-

-

-

-

-

🔠
🔢

-

-

-

-

-

🔠
🔢

(24) -

-

-

-

-

-

-

-

-

-

-

-

-

🔠
🔢

-

-

-

🔠
🔢

-

-

-

🔠
🔢

-

-

🔠
🔢

(25) -

-

-

-

-

-

-

-

-

-

-

🔠
🔢

-

-

🔠
🔢

(26) -

-

-

-

-

-

-

-

-

Across

  • (9) Organizational control, 10 letters

  • (10) Data analysis, 10 letters

  • (12) Information, often numerical, 4 letters

  • (13) Earth-related engineering, 11 letters

  • (16) Forces and motions, 9 letters

  • (17) Potential hazards, 5 letters

  • (20) Substances for construction, 9 letters

  • (21) Moral principles, 6 letters.

  • (23) Upkeep and repair, 11 letters

  • (24) Efficiency improvement, 12 letters

  • (25) Imitation of operation, 10 letters

  • (26) Movement of goods or people, 9 letters

Down

  • (1) Long-term viability, 14 letters

  • (2) Programming computers, 6 letters

  • (3) City development, 12 letters

  • (4) Constructed buildings or frameworks, 10 letters

  • (5) Fluids in motion, 9 letters

  • (6) Combining fields, 16 letters

  • (7) Physical behaviors, 9 letters

  • (8) Choices made, 9 letters

  • (11) Complex networks, 7 letters

  • (14) Surrounding natural world, 11 letters

  • (15) Available supplies, 9 letters

  • (18) Weather patterns, 7 letters

  • (19) Information exchange, 13 letters

  • (20) Simulating real-world systems, 9 letters

  • (22) Lack of sureness, 11 letters

Task 1.3 Commit your changes to a separate branch#

Click the green Commit changes, but instead of the default branch, create a new branch for this commit and start a pull request.

Task 1.4 Create pull request#

Now you’re automatically send to the screen ‘open a pull request’. Here you can give some description (for other to see what you’ve done) and the changes are shown. Click the green ‘Create pull request’

Note that this pull request only contains one commit now, but we can add more commits to this branch which are all added to this pull request too. Furthermore, when doing this locally, there’s no option for a pull request (because there’s no one else on your local computer to give you feedback). In that case, you can still merge one branch into another directly and push those changes to the remote.

Task 1.5 Merge your changes into main#

Click Merge pull request to merge your changes into the main branch.

Task 1.6.additional Looking for merge conflicts#

Eventually repeat this process for multiple words on separate branches. Do you notice when merge conflicts appear?

By Tom van Woudenberg, Delft University of Technology. CC BY 4.0, more info on the Credits page of Workbook.

Contents