Untitled

Part A: Basic Git Operations (20 Marks)

1. Git Initialization & Basic Commands (5 Marks)

a) Initialize a new Git repository and create a README file with some content. b) Stage and commit the changes using appropriate Git commands. c) View the commit history.

2. Branching and Merging (5 Marks)

a) Create a new branch named "feature-branch" from the main branch. b) Add a new file in the "feature-branch" and commit the changes. c) Merge "feature-branch" into the main branch and resolve conflicts if any. 3. Git Clone and Forking (5 Marks)

a) Clone a remote GitHub repository into your local machine.

b) Fork an open-source repository and make modifications.

c) Create a pull request to merge your changes.

4. Collaboration on GitHub (5 Marks)

a) Add a collaborator to your repository and grant appropriate permissions. b) The collaborator should make changes and push them to the repository. c) Review and accept the changes via a pull request.

Part B: Advanced Git Operations (30 Marks)

5. Git Push and Pull Requests (10 Marks)

a) Create a new feature in a separate branch and push it to the remote repository. b) Raise a pull request for merging the feature into the main branch. c) Approve and merge the pull request.

6. Resolving Merge Conflicts (10 Marks)

a) Simulate a merge conflict scenario by modifying the same line in two different  branches.

b) Attempt to merge the conflicting branches.

c) Resolve the conflict manually and commit the changes.

Submission Guidelines:

∙ Upload the project repository on GitHub/GitLab.

∙ Submit a document containing Git commands used, their explanations, and  screenshots.

∙ Share the repository link for evaluation.

End of Paper