search

marklogic-community / roxy

Deployment tool for MarkLogic applications. Also provides optional unit test and XQuery MVC structure
Other
87 stars 66 forks source link

changes for issue 863 #864

Closed tdiepenbrock closed 6 years ago

tdiepenbrock commented 6 years ago

This commit contains changes for issue 863. These changes are confined to the setup:configure-indexes(), setup:add-geospatial-path-indexes(), setup:add-geospatial-region-path-indexes(), and setup:add-fields() functions, although I think other hunks got staged/committed. #863

grtjn commented 6 years ago

There is a merge conflict, which usually means your local git repo is out of date. Can you git fetch upstream, and then git rebase remotes/upstream/dev?

grtjn commented 6 years ago

I think we also need to compare with #852, there seems to be an overlap?

grtjn commented 6 years ago

The file changes aren't clean for some reason. Can you rebase rather than merge?

grtjn commented 6 years ago

This PR was replaced by PR #866. Again, thanks @tdiepenbrock, your code changes were definitely useful! Just couldn't merge this PR since it was unclean, so cleaned up manually, and merged pieces from multiple PRs!