Git Merging and Rebasing Practice

Overview

This repository serves as a practice ground for understanding and applying Git merging and rebasing concepts. Two projects are included, each focusing on either merging or rebasing branches within a Git repository.

Projects

Project 1: Merging

Task

Merge the bug-fix branch into feature-one, followed by merging feature-one into the master.

Instructions

1. Fork the provided repository.
2. Rename the forked repository to the format HW_STUDENTNO.
3. Execute the necessary Git commands to complete the merging tasks.
4. Resolve conflicts by retaining content from both branches.
5. Push the changes to your forked repository.

Project 2: Rebasing

Task

Rebase the bug-fix branch into feature-one, and then rebase feature-one into the master.

Instructions

1. Fork the provided repository.
2. Rename the forked repository to the format HW_STUDENTNO.
3. Execute the required Git commands for rebasing.
4. Resolve conflicts by retaining content from both branches.
5. Push the changes to your forked repository.

How to Use This Repository

1. Head to the GitHub URL provided in the assignment.
2. Fork the repository and rename it following the specified format.
3. Follow the instructions for each project, making the necessary changes.
4. Push the changes to your forked repository.
5. Include the URL to your GitHub repository in your assignment's PDF, along with the executed commands.

Submission Guidelines

Please ensure you provide the URL to your GitHub repository in your assignment's PDF, along with the commands you applied to the repository. Follow the instructions carefully for successful completion of the assignment.

Feel free to use this repository to practice and enhance your understanding of Git merging and rebasing. Good luck!