Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Investigated whether Patrick's search changes branch can be updated to develop #1361

Closed
1 task
louise-davies opened this issue Jul 25, 2022 · 2 comments
Closed
1 task
Labels
datagateway-search Issues relating to the search plugin enhancement New feature or request

Comments

@louise-davies
Copy link
Member

Description:
Patrick made changes to datagateway-search for his Lucene improvements stuff on his own branch, but this is now many commits behind develop and so would need to be made up to date. We should try and merge develop in and resolve merge conflicts, but if this is too complex (probably due to MUIv5 changes) - then we'll have to port all the changes over from his branch onto develop.

Acceptance criteria:

  • Investigate whether we can merge develop into Patrick's branch
@kennethnym
Copy link
Member

I have attempted to merge develop into the branch. This is the list of files that have conflicts:

Screenshot 2022-07-29 114226

(I think roughly 40 files are affected)

Although some of them are just snapshot conflicts and some of them are relatively easy to merge, a lot of test files are affected. On top of that, the branch is still on yarn v1. Since we need to migrate the affected test files to testing-library anyway, I don't think it is worth the effort to merge the complicated diffs. I think it will be easier to cherry-pick or port the changes to develop on a new branch. We can also consider rebasing the commits on the latest commits on develop.

@louise-davies
Copy link
Member Author

Done in #1401

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
datagateway-search Issues relating to the search plugin enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants