Crave Build Error when Merging PR

[Eric Pugh <ep...@opensourceconnections.com>]

Hi all,

I merged a conflict for a Pull Request (https://github.com/apache/solr/pull/1304 <https://github.com/apache/solr/pull/1304>), and that triggered a Crave build.   Crave isn’t happy due to some git merging/patching that didn’t work out:

https://github.com/apache/solr/actions/runs/4065466799 <https://github.com/apache/solr/actions/runs/4065466799>



Here is the relevant portion from the build log below.  I wonder if our git pull process is too fancy?

Waiting for build id:51460 to start...
Setting up workspace (this could take some time)...
Pulling container image...
Finished pulling container image
Switched to a new branch 'detached-5ddc248b6cd433dbf079a08547cbe5e9c3b5a026'
setting commitID to ee8c18188eb8dc927098f21826a38942fa4d8e9b
committer id not set in git config, hence setting it to Crave
committer email not set in git config, hence setting it to crave@crave.io
error: patch failed: solr/CHANGES.txt:123
error: solr/CHANGES.txt: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: SOLR-16618 Admin UI Analysis page should include dynamic fields
Applying: updated CHANGES.txt file
Applying: SOLR-16621: Admin UI fails to grant user permissions that have wildcard role (#1294)
Applying: SOLR-16627: Upgrade google-cloud-bom to 0.184.0, re2j to 1.6, and grpc to 1.51.0 (#1301)
Applying: SOLR-6312: SolrJ Cloud clients now correctly support isUpdatesToLeaders() being false.
Patch failed at 0005 SOLR-6312: SolrJ Cloud clients now correctly support isUpdatesToLeaders() being false.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


_______________________
Eric Pugh | Founder & CEO | OpenSource Connections, LLC | 434.466.1467 | http://www.opensourceconnections.com <http://www.opensourceconnections.com/> | My Free/Busy <http://tinyurl.com/eric-cal>  
Co-Author: Apache Solr Enterprise Search Server, 3rd Ed <https://www.packtpub.com/big-data-and-business-intelligence/apache-solr-enterprise-search-server-third-edition-raw>	
This e-mail and all contents, including attachments, is considered to be Company Confidential unless explicitly stated otherwise, regardless of whether attachments are marked as such.