Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

working changed File Folder Structure Migrate to Next.js 13 #659 #772

Closed
wants to merge 4 commits into from
Closed

working changed File Folder Structure Migrate to Next.js 13 #659 #772

wants to merge 4 commits into from

Conversation

crocmons
Copy link
Collaborator

@crocmons crocmons commented Jul 1, 2023

working changed File Folder Structure.. Migrate to Next.js 13 #659

@vercel
Copy link

vercel bot commented Jul 1, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
informatician ❌ Failed (Inspect) Jul 2, 2023 7:12am

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello crocmons, thanks for rising a Pull request, your contribution is valuable to us. The maintainers will review this Pull Request and provide feedback as soon as possible. Keep the great work up!

Copy link
Member

@s2sharpit s2sharpit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Member

@s2sharpit s2sharpit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
But the branch has too much and complex conflicts.

@crocmons
Copy link
Collaborator Author

crocmons commented Jul 1, 2023

I also see it .. I don't know how can I fix it because my resolve conflict option is disabled..@s2sharpit

@rohansx rohansx added level3 Difficult issues gssoc23 This label is for GirlScript summer of code labels Jul 1, 2023
@s2sharpit
Copy link
Member

The branch seems to have numerous and intricate conflicts that need to be resolved. To address this effectively, let's adopt an incremental approach rather than migrating the entire codebase at once. Instead, we'll create a completely new codebase or project and add parts of the codebase, or the code for each page, one by one as individual steps. This method allows us to better manage conflicts, review changes more efficiently, and ensure a smoother transition. As a first step, Let me create the starting files required for Next.js and tailwindcss on the new branch. As we progress, I kindly request you to create a pull request after completing each step or when a page is fully developed. This way, we can maintain an organized workflow, provide focused feedback, and keep track of the changes more effectively. Let's break it down into manageable parts and create pull requests accordingly. Thank you for your understanding and collaboration!

@crocmons
Copy link
Collaborator Author

crocmons commented Jul 1, 2023

Actually, that's a great idea but now the merge conflict is resolved...so we can work on this branch.

@crocmons crocmons closed this by deleting the head repository Jul 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gssoc23 This label is for GirlScript summer of code level3 Difficult issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants