Informatics 3A
IFM3A10 · IFM03A3
Git Assignment 3 Due: 29 April 2025 @ 10:00
-f
OVERVIEW – Revisiting the basics
Because I know many of you are still struggling with the git basics I thought it may be a good idea to
revisit some of the basics, and yes we also need to deal with merge conflicts .
INSTRUCTIONS
Task 1: Branching and Merging
1. Accept the repository invitation:
C# : https://classroom.github.com/a/Q1e0lyFC
2. Clone the repository to your local machine.
3. Create a new file called hello.txt and add the text "Hello, World!" to the file.
4. Commit the changes and push them to GitHub.
5. Create a new branch called new-branch
6. Switch to the new branch
7. Create a new file called new-file.txt and add some text to it.
8. Commit the changes and push them to GitHub.
9. Switch back to the main branch.
10. Merge the new-branch into the main branch.
11. Push the changes to GitHub.
Task 2: Pull Requests and Resolving Conflicts
1. Create a new branch called feature-branch.
2. Switch to the new branch.
3. Edit the hello.txt file and add a new line of text.
4. Commit the changes and push them to GitHub.
5. Switch back to the main branch.
6. Edit the hello.txt file and add a different line of text.
7. Commit the changes and push them to GitHub.
8. Open a pull request to merge the feature-branch into the main branch.
9. Resolve the conflict that occurs when merging the pull request.
10. Merge the feature-branch into the main branch.
11. Push the changes to GitHub.
This assignment requires you to perform all merges and resolve merge
conflicts manually!
MARK ALLOCATION
CRITERIA MARK
Branching and merging 10
Pull requests 5
Resolving conflicts 15
TOTAL 30
