PR #1269

[yangc95]

Efforts to support PR #1269

@ericsonrd Let's discuss here to get your changes up! Do you need a general overview of how to push up your changes or do you have specific questions?

[ericsonrd]

@yangc95 Thanks. I guess I need to be clear on what should I do now with the rn_components branch, since it's also out of sync. I'm not sure if I need to merge the main into it, overwrite it or delete it and create a new branch from the updated main. I have backed up the React Components entry I'm working on, in case I needed to create a new branch.

I though I needed to keep the rn-components branch because of the pull request, so a question would be: Can the pull request be referenced from a new branch?

[ericsonrd]

Thanks @Dusch4593. I wasn't able to checkout to cc-docs-frk, says "error: pathspec 'cc-docs-frk' did not match any file(s) known to git". But I was able to update main and then merge it into rn_components. It's now synced.

rn_components is now "10 commits ahead of Codecademy:main". It seems these are the commits I've been doing since working on the React Native Components entry. Is this ok or should this be solved too?

[yangc95]

@ericsonrd apologies, that was my edit, I thought your main branch name was cc-docs-fork. @Dusch4593 originally had it as main

[Dusch4593]

@ericsonrd yay! This means your PR branch is now caught up and you can now implement and push the latest round of feedback. 😄

[Dusch4593]

Also, super mega kudos to you, @ericsonrd, for hanging in there for this PR!

[ericsonrd]

Great!!! Thanks a lot for all your help! @Dusch4593 and @yangc95. I'll continue with the PR now! 😁👍🏽