Skip to content

fix: remove merge conflict markers from login page#7249

Open
RajveerSingh-24 wants to merge 1 commit into
dhairyagothi:Mainfrom
RajveerSingh-24:fix/login-merge-conflict
Open

fix: remove merge conflict markers from login page#7249
RajveerSingh-24 wants to merge 1 commit into
dhairyagothi:Mainfrom
RajveerSingh-24:fix/login-merge-conflict

Conversation

@RajveerSingh-24
Copy link
Copy Markdown

📝 Pull Request Description

Related Issue

Closes #7144

Summary

Removed unresolved Git merge conflict markers, eliminated duplicate login form content, and restored the intended login page structure.

Type of Change

  • 🐛 Bug fix (non-breaking change which fixes an issue)
  • ✨ New project addition
  • 🚀 New feature or UI/UX enhancement
  • ♻️ Code refactoring / clean-up
  • 📝 Documentation update
  • ⚙️ GitHub Workflow automation or DX improvements

🛠️ Changes Made

  • Removed merge conflict markers
  • Removed duplicate login form
  • Cleaned login page layout

Browser Compatibility Check

  • Tested and verified in Google Chrome
  • Tested and verified in Mozilla Firefox
  • Tested and verified in Safari / Microsoft Edge

Responsive & Accessibility Checks

  • Verified responsive layout on Mobile viewports (using DevTools)
  • Verified responsive layout on Tablet viewports
  • Keyboard navigation and focus outlines checked
  • Semantic HTML and ARIA labels checked

📷 Screenshots / Video Recording

Please attach screenshots or screen recordings showing before vs after behavior if this PR includes visual changes.

Before:

Screenshot 2026-06-07 at 11 06 45 PM

After:

Screenshot 2026-06-07 at 11 08 21 PM

🤝 Contributor Checklist

  • My code follows the code style guidelines of this project.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have updated the documentation / README files accordingly.
  • My changes generate no new warnings or console errors.
  • There are no unrelated changes or formatter noise in this PR.

@vercel
Copy link
Copy Markdown

vercel Bot commented Jun 7, 2026

Someone is attempting to deploy a commit to the Dhairya Gothi 's projects Team on Vercel.

A member of the Team first needs to authorize it.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 7, 2026

Thank you for submitting your pull request! 🙌 We'll review it as soon as possible. In the meantime, please ensure that your changes align with our CONTRIBUTING.md. If there are any specific instructions or feedback regarding your PR, we'll provide them here. Thanks again for your contribution! 😊

@RajveerSingh-24
Copy link
Copy Markdown
Author

I have resolved the merge conflict markers and tested the login page locally. The only remaining check appears to be the Vercel preview authorization, which may require maintainer access.

@dhairyagothi dhairyagothi added gssoc:approved Approved by admin level:intermediate Intermediate difficulty task type:refactor Refactoring/improvement labels Jun 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

gssoc:approved Approved by admin level:intermediate Intermediate difficulty task type:refactor Refactoring/improvement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Login Page Displays Git Merge Conflict Markers and Duplicate Form

2 participants