search

duc-beluga / gt-planner

GT Planner is a website that provides students with a visual roadmap of their academic journey, making course planning clear and simple.
https://duc-beluga.github.io/gt-planner/
GNU General Public License v3.0
3 stars 2 forks source link

Client Error Page #30

Closed cgensheimer closed 7 months ago

cgensheimer commented 7 months ago

very very basic

Screenshot 2024-03-04 at 17 55 57
cgensheimer commented 7 months ago

Merge conflicts are extremely simple and will be resolved upon approval

duc-beluga commented 7 months ago

I think you haven't pull the latest changes from main. I resolved the conflict. Try to git pull from both main and error-page-404. Then, git merge error-page-404 with main and see if it works on your machine.

cgensheimer commented 7 months ago

I think you haven't pull the latest changes from main. I resolved the conflict. Try to git pull from both main and error-page-404. Then, git merge error-page-404 with main and see if it works on your machine.

Shouldn't be an issue, the auto merge with main will bring it up to date with all the commits since the conflicts are resolved. "Merging can be performed automatically with 1 approving review," but is blocked until you approve it.

duc-beluga commented 7 months ago

Oh yea, you're right. I thought there were more than 2 files changed and some in the main was overwritten.