feat: migrate to NextJS app router

[YaTut1901]

• Closes: Use Next.js v14 resources in create fuels template #2517

[YaTut1901]

hello, can anybody suggest how to solve those conflicts? I am checking the branch and it is up to date with master

[arboleya]

Outdated Fork

hello, can anybody suggest how to solve those conflicts? I am checking the branch and it is up to date with master

Your fork/branch is evidently not up to date with master; otherwise, there wouldn't be conflicts.

You seem to lack basic knowledge of how Git and GitHub work, which makes it hard for you to contribute to open-source projects. It would be best if you improved on that.

Sync Remote

First, you must synchronize your fork — you can do this even using the UI.

Update Local

From there, you can:

cd you/local/repo

# fetch updates from your synchronized repo/fork
git pull origin master

# checkout to your feature branch
git checkout feature/app-router-nextjs

# apply new changes from master — requires resolving the conflicts
git merge master

# push the updated branch to your remote
git push origin feature/app-router-nextjs

Not enough?

If even that doesn't sound straightforward, you can re-do everything:

• Delete your local feature branch
• Start a new one from [your updated] master
• Re-apply your changes, push, and open a new PR

Final Notes

I recommend studying GIT.

We may not be able to help you with that.

[YaTut1901]

yes, seems like that is a gap in my knowledge, thanks for pointing it out

Premature approval

[petertonysmith94]

Thank you for you contribute @YaTut1901 - we appreciate it!

[YaTut1901]

Thank you for you contribute @YaTut1901 - we appreciate it!

Thank you for your advices! BTW, is there anything other in scope of your projects I can help with?

[petertonysmith94]

Thank you for you contribute @YaTut1901 - we appreciate it!

Thank you for your advices! BTW, is there anything other in scope of your projects I can help with?

You're more than welcome!
I was going to suggest #2613 - but I can see you have already spied it 😄

[danielbate]

🚀