os-js / osjs-client

OS.js Client Module
https://manual.os-js.org/
Other
31 stars 31 forks source link

feat(search):add feature search adapter support #204

Closed mahdi00021 closed 1 year ago

mahdi00021 commented 1 year ago

please check in new PR

andersevenrud commented 1 year ago

Refer to the review I made in #202 . Most of what I wrote there is still an issue here.

andersevenrud commented 1 year ago

I'll make a new review just to make it easier... hold on...

andersevenrud commented 1 year ago

I'm fairly sure you've done something wrong in the rebasing somewhere.

Because a successful rebase does not add changes/stuff that already exists in the upstream master branch.

mahdi00021 commented 1 year ago

I'm fairly sure you've done something wrong in the rebasing somewhere.

Because a successful rebase does not add changes/stuff that already exists in the upstream master branch.

What should I do now to fix it?

andersevenrud commented 1 year ago

The easiest way if you don't know how to work with git is pretty simple; start over:

Create a new fork from the upstream repo, then a new branch, then copy only the changes required and make a new PR.

mahdi00021 commented 1 year ago

The easiest way if you don't know how to work with git is pretty simple; start over:

Create a new fork from the upstream repo, then a new branch, then copy only the changes required and make a new PR.

There are so many things messed up that I'm confused, I have to fork from the beginning