gf2121 commented on PR #14563: URL: https://github.com/apache/lucene/pull/14563#issuecomment-2858342367
Thank you for suggestions @dweiss ! I'm not sure i exactly get your point, but i think i did not make myself clear. Let me clarify a bit - By 'force-push', i was meaning that i did a force push to this branch (`gf2121:backport_14333`), not planning to force push to branch_10x. > @[gf2121](https://github.com/gf2121) gf2121 [force-pushed](https://github.com/apache/lucene/compare/a972c58e308fabb77669866c3a295e47c8d8a2a4..d1f5b2dab5dcf6f8ee2619b841e2769b7c156329) the backport_14333 branch from [a972c58](https://github.com/apache/lucene/commit/a972c58e308fabb77669866c3a295e47c8d8a2a4) to [d1f5b2d](https://github.com/apache/lucene/commit/d1f5b2dab5dcf6f8ee2619b841e2769b7c156329) [3 hours ago](https://github.com/apache/lucene/pull/14563#event-17551734740) Some changes made to `branch_10x` after this PR opened and they caused some conflicts. I wanted to make the conflicts resolved within the cherry-pick commits, like `git cherry-pick xxx && {resolve conflicts} && git add . && git cherry-pick -- continue`, instead of `git merge branch_10x`, which will introduce another commit. This is why i did a force push. And by 'push directly to branch_10x', I meant that i wanted to make the split commits to branch_10x instead of a `squash and merge`, so that commits can be same as how they are merged to main. I wish i explained things clear :) -- 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. To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
