For your pull request on Day 30, the PR process can be a little tricky if the source and destination have fallen out of sync. If you are unable to resolve conflicts in your PR so that it can be merged cleanly, you may need to follow these steps:
-
Pull changes from the parent collection to the local collection in your own workspace
- You may need to select “Use Source” when resolving conflicts where it looks like the example is deleted
- Make sure you have the latest leaderboard in your local version as reflected in the parent version, so that you’re not deleting people from the leaderboard
- Re-apply your own updates to your local collection and save, since pulling changes will wipe out your previous updates.