Closed aidanhenry closed 1 month ago
It looks like I'm many commits ahead of the support branch. What's the best way to get this synced up?
Just merge the current content of support/v6.0 branch to your 4290/search-buildings branch before creating the PR.
Update: This is valid only if 4290/search-buildings branch was created as a fork from support/v6.0, please see my next comment for details.
Did you create 4290/search-buildings branch as a fork from develop branch? If yes, this was wrong and you have to create a brand new branch from current support/v6.0, then add your updates related to #4290, and then create new PR for these changes targeting support/v6.0.
The current develop branch contains features that will appear in the future 6.1 release. If your 4290/search-buildings is based on develop, merging your PR to support/v6.0 will also add the 6.1 features to the upcoming 6.0 hot fix release, that would be very very wrong.
Closing this PR to reopen it from a branch forked from support/v6.0
Description
This adds the search feature which was accidentally missing from previous PR. I have done my best to avoid running in to the same issues that the previous PR had. This was feature was based on the existing event search feature, but simplified. I do not see any new errors.
Fixes #4290
Review Time Estimate
Please give your idea of how soon this pull request needs to be reviewed by selecting one of the options below. This can be based on the criticality of the issue at hand and/or other relevant factors.
Type of changes
Please select a relevant option:
Checklist:
Please select all applicable options: