dweiss commented on PR #14563:
URL: https://github.com/apache/lucene/pull/14563#issuecomment-2858394922
When you force-push to a PR branch, some of that PR's commits are (or may
be) gone. This effectively rewrites the history of the PR branch and comments
made against those commits.
There is nothing wrong with merging against the base branch (and fixing
conflicts in the merge commit or thereafter) while you're working on a PR. I
consider it normal for long-lived PRs. This keeps any previous commits in
history and the diff will still only show the changes against the branch you're
trying to merge with. So it'll be something like this, typically:
```
X---Y---(m)---Z---(m)--- PR
/ / /
A---B---C---D---E---F--------- main
```
where (m) is a merge against the target of the PR (main here). Eventually
all of that PR's diff is squashed into a single commit (which we prefer over
merging back the entire PR history) but the PR shows how the patch evolved.
Hope this makes sense?
--
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
