Merging Sprint-2 branch to Master

[navkamboj]

Description
The task involves merging the changes and updates made for the 2 core features in the Sprint-2 branch into the master branch of the project. The purpose is to integrate the completed work from the Sprint-2 development cycle into the main codebase, ensuring that all the changes are properly incorporated and conflicts are resolved.

Acceptance Criteria

1. Review Changes:

• Conduct a comprehensive review of all the changes and updates implemented for the core features in the Sprint-2 branch.
• Understand the scope of the changes and their impact on the project.

2.Update the Sprint-2 Branch:

• Ensure that the Sprint-2 branch is up-to-date with the latest changes from the master branch.
• Pull the latest changes from the master branch and resolve any conflicts, if present.

3.Resolve Conflicts:

• If conflicts occur during the merge process, carefully analyse and resolve them.
• Collaborate with the team members, if necessary, to ensure a smooth resolution.

4.Test and Validate:

• After merging, thoroughly test the merged code to ensure that it functions as expected.
• Validate that the functionality implemented in the Sprint-2 branch is still intact and functioning correctly in the merged code base.

5. Merge to Master:

• Once all conflicts are resolved, the code has been thoroughly tested, and the necessary reviews and updates are completed, merge the Sprint-2 branch into the master branch.
• Ensure that the merge process is executed correctly to avoid introducing any new issues or conflicts.

---

Additional Information

Story Points: 0
**Priority: ** High