[GitHub] [lucene-solr] zacharymorn commented on pull request #2471: LUCENE-9385: (Backporting) Add FacetsConfig option to control which drill-down terms are indexed for a FacetLabel

[GitBox <gi...@apache.org>]

zacharymorn commented on pull request #2471:
URL: https://github.com/apache/lucene-solr/pull/2471#issuecomment-809872761


   HI @mikemccand , thanks for approving and merging the changes! I researched around cross-repo cherry-picking and found that git seems to support it to some extend, but may still require manual conflict resolution effort. The steps / commands I ran inside the old lucene-solr repo on branch `branch_8x` are:
   1. `git remote add lucene https://github.com/apache/lucene.git`
   1. `git fetch lucene`
   1. `git branch lucene_main lucene/main`
   1. `git log lucene_main` # to get the commit hash
   1. `git checkout -b branch_8x_backporting_LUCENE-9385_skip_drilldown`
   1. `git cherry-pick -x 3648a1020a8ab`
   
   At this point git showed me there was conflict for `FacetsConfig.java`, in basically all sections of code I had changed, so I had to resolve them manually. However, I noticed it did not report any conflict for new tests in the test classes, so I guess it can handle cross-repo addition fine, but may report on conflict for modification. 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@lucene.apache.org
For additional commands, e-mail: issues-help@lucene.apache.org