search

ew00github / HTTPCatClone

Recreation of http.cat
0 stars 0 forks source link

Service get() revision #7

Closed ew00github closed 11 months ago

ew00github commented 11 months ago

Renamed methods in the HttpCatService class to make their purpose more clear. Moved the JSONConverter to the LoadDatabase class so that the HttpCatService methods only use HttpCatRepository's methods.

Additionally, I found a bug preventing the program from running should the H2 Database be reset or empty to begin with, and I added a line to application.properties that should fix this.

BradRammel commented 11 months ago

Ope, this is a common mistake that people might make with Git. You created a new branch based off of your previous branch instead of Master. This branch is based off of the Formatting-Revision branch. What this means is that we're forced to merge your first PR before this one. If you look through the changed files on this PR you'll notice that all the changes from your other PR are there along with your new changes.

What I would normally do before creating a branch is make sure that I'm on the Master branch. Then I would create it and this guarantees that you don't create code dependent on another PR

ew00github commented 11 months ago

I won't lie, I had already started a branch for issue #3, so I tried to delete the branch, and I was prompted to shelve, delete, unshelve. I wasn't sure what I was doing and now my local master is out of sync with the remote master, and updating won't change anything. This is probably a really simple fix but I would rather not make things worse, do you know what I should do ?

ew00github commented 11 months ago

Could I just create a new branch from the remote master, and then wait until all the pull requests are closed and resync my local master with the remote?

EDIT: I rolled back the changes on the local master to the last commit and now everything is back to normal, I think.

BradRammel commented 11 months ago

I have no idea what happened lol I would've deleted the repo on my computer and just cloned it again. That should give you a fresh copy of all the branches