Adding CalculatorConundrum exercise for #1861 exception-handling concept exercises (WIP) by rv02 · Pull Request #2005 · exercism/java

So there was a conflict in config.json.. I thought to sync my local repo.. I did and then pushed and there are so are so many commits showing now... of other people too

I am so sorry about that. That is the core of git - how to pull in changes from the main repo into a fork. This is also why we typically advise working in a branch rather than directly on main. If you are still able to do so, you could try creating a branch in your forked repo and then cherrypicking your commits from the fork's main branch over into the branch. You may need to reset the HEAD of your main branch to before you pulled in the other changes first.

Our documentation has some instructions: https://github.com/exercism/java/blob/main/CONTRIBUTING.md#before-making-your-pull-request

So typically how this works is you work in branch some-branch over in your fork of the main repo. When you want to pull in changes from the primary repo's main branch, you first sync your main branch (typically can be done using a button in your fork repo). This just pulls all of the commits that are now in the primary repo's main branch into your fork's main branch. Now that you are synced, you can rebase your fork's some-branch onto your fork's main branch. At the command line, this is done by first getting onto some-branch and then rebasing on top of main:

$ git switch some-branch
$ git rebase main