Skip to content

feat: added JSON file and DataProvider file for Chelsea #318

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

Closed
wants to merge 21 commits into from

Conversation

Cogbonnia
Copy link
Contributor

I'm having the same problem with my pull request including work from previous lessons. I know you've approved my work from lessons 5, 6, & 7, but the main repo doesn't have those changes. That work is being included with my pull request for lesson 9, even though my repo is up to date.

What should I do?

@anthonydmays
Copy link
Contributor

anthonydmays commented Oct 15, 2024

I'm having the same problem with my pull request including work from previous lessons. I know you've approved my work from lessons 5, 6, & 7, but the main repo doesn't have those changes. That work is being included with my pull request for lesson 9, even though my repo is up to date.

What should I do?

It looks like you corrupted your main branch by making commits to it. See this link that compares what you have in your main vs the upstream repo (there should be no differences when up to date, but in your case there are some): main...Cogbonnia:code-differently-24-q4:main

Your main fork is busted. To restore it, you can run the following commands:

git checkout main
git fetch upstream
git reset --hard upstream/main
git push --force

After that, you can rebase your lesson_09 branch which should hopefully fix the issue:

git checkout lesson_09
git rebase main

If you run into problems, it could be easier to make a new lesson_09 branch off of your now clean main branch and copy over just the files you want.

@Cogbonnia Cogbonnia closed this Oct 15, 2024
@Cogbonnia Cogbonnia deleted the lesson_09 branch October 15, 2024 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants