Skip to content

[BUG] Unresolved merge conflict artifacts in 4 page files - build pipeline broken #256

Description

@Siddh2024

Description

Multiple page files contain unresolved Git merge conflict artifacts:

  • NotFound.jsx (lines 1-5) — conflict markers with empty incoming changes
  • Recommendations.jsx (lines 1-5) — conflict markers leaving invalid JS state
  • NewArrivals.jsx (lines 1-14) — duplicate imports with conflicting dependencies
  • BestSellers.jsx (lines 1-14) — duplicate imports with conflicting dependencies

For example, Recommendations.jsx:
`jsx
<<<<<<< HEAD
import React from 'react';
import IssueRecommendations from '../components/IssueRecommendations';

upstream/main
`
This leaves an empty block after ======= with no fallback import, making the file syntactically invalid.

Locations

  • rontend/src/pages/NotFound.jsx lines 1-5
  • rontend/src/pages/Recommendations.jsx lines 1-5
  • rontend/src/pages/NewArrivals.jsx lines 1-14
  • rontend/src/pages/BestSellers.jsx lines 1-14

Impact

These files will fail to parse and cause build errors. The build pipeline is broken.

Suggested Fix

Resolve all merge conflicts by choosing the correct version for each conflict and removing the conflict markers.

Please assign this issue to me @Siddh2024 so I can fix it.

Metadata

Metadata

Assignees

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions