/Shopping-Mart

Microsoft Clone Website using HTML,CSS and JavaScript

Primary LanguageHTML

My Project Exploration

This repository contains my exploration of the open-source project "Shopping-Mart".

Tasks Completed

  • Cloned the repository.
  • Added upstream remote.
  • Created a new branch and made changes.
  • Handled conflicts.
  • Enabled GitHub Pages.

Commands Used

  • git clone https://github.com/Elizaphan88/Shopping-Mart.git
  • git remote add upstream https://github.com/janeezy/Shopping-Mart.git
  • git checkout -b feature-update
  • git add .
  • git commit -m "Commit message"
  • git push -u origin main
  • git merge feature-update
  • git checkout -b resolve-conflict

Challenges Faced

  • Faced conflicts while merging branches.
  • Resolved conflicts manually in new_file.txt.