ErikStoupignan / Capstone-project-module-1

An online website for a conference, personalized with the content for an "Intercultural Exchange Mexico-Canada 2023". Built with HTML, CSS, SASS and JavaScript.

https://erikstoupignan.github.io/Capstone-project-module-1/index.html

3 stars 0 forks source link

Peer to peer code review #2

Open ErikStoupignan opened 2 years ago

ErikStoupignan commented 2 years ago

Merging conflicts

rebaz36 commented 2 years ago

Hey @ErikStoupignan you have merging conflicts on this Repository

To solve this issue

head over to your capstone-project Branch
on the command line 'git merge main'
this pulls everything you have in the main branch and asks you which one you want to keep
go to the track changes on the vs code
pick which version of the files you want to keep
and then commit and merge

ErikStoupignan / Capstone-project-module-1

Peer to peer code review #2

Merging conflicts

Hey @ErikStoupignan you have merging conflicts on this Repository

To solve this issue

Follow this and your conflicts should be solved