Skip to content

Conversation

@annarider
Copy link
Contributor

Because

I changed the word unneccessary to unnecessary

This PR

I fixed the typo by changing the word unneccessary to unnecessary.

Issue

I didn't open an issue for a small typo change. I can open an issue if it is required. The contributing guidelines seem to suggest I could open a PR directly for such a small change.

Additional Information

None

Pull Request Requirements

  • I have thoroughly read and understand The Odin Project Contributing Guide
  • The title of this PR follows the location of change: brief description of change format, e.g. String spec: Update instructions for clarity
  • The Because section summarizes the reason for this PR
  • The This PR section has a bullet point list describing the changes in this PR
  • If this PR addresses an open issue, it is linked in the Issue section
  • If this PR includes changes in the spec folder, they are also updated in the corresponding file in the spec_answers folder (with passing tests).

@JoshDevHub
Copy link
Contributor

Hello @annarider

Very sorry this didn't get seen until just now. Our exercise repos aren't as heavily monitored as the curriculum or main site.

If you're still interested in working on this, I'd be glad to accept it. You'd just have to fix the merge conflict. If not, that's perfectly fine and we can handle it ourselves. Just let us know.

@annarider
Copy link
Contributor Author

@JoshDevHub How do I fix the merge conflict? I can't do it via the web interface, according to Github. Will I have to pull the repository locally and then do a manual merge conflict resolution and push to update the PR?

@JoshDevHub
Copy link
Contributor

JoshDevHub commented Jan 10, 2026

@annarider Yeah you'll have to:

  1. It looks like you already have a fork here. If you don't already have it, you want to clone that fork to your machine.
  2. After cloning and cding into this repo, you want to git fetch patch-4. This will fetch the branch that this PR lives in.
  3. You want to checkout that branch to change to it. git checkout patch-4
  4. So there's your fork on GitHub, we're going to call that origin. There's also the original repository that you forked from (this repo) that you're making your PR for. We're going to call that upstream (this is the conventional name for this stuff). You want to make sure you have both of these added as remotes in your clone. You can run git remote -v to check if both origin and upstream are there. If they're not, you want to go to the repo's main page on GitHub, and click the green button in the top-right to copy the SSH link to the code. Then you would run
    # run this if you need to add the origin remote
    git remote add origin <ssh_link_to_your_fork>
    
    # run this if you need to add the upstream remote
    git remote add upstream <ssh_link_to_odins_repo>
  5. Once that's done, while making sure you're still in the patch-4 branch, you want to run git pull upstream/main. This will attempt to integrate upstream's main branch into your local patch-4. It'll fail because there are conflicts you need to solve. Really all you should have to do is delete spec_answers/13_input_output_answer.rb (this file was renamed) and add your typo fix to spec_answers/13_input_output_answer_spec.rb (the new name for that file).
  6. Once you've gotten the conflicts resolved, you can run git add . and git commit -m "Merge main into patch-4" to commit the merge. Then you should be able to git push origin patch-4.

If you get stuck on any part of this and Google isn't helping you get through it, just let me know.

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