dsmiley commented on pull request #2016: URL: https://github.com/apache/lucene-solr/pull/2016#issuecomment-761599353
Yes; invest time in learning Git more; it's a prerequisite nowadays. I'm no Git expert (e.g. not quite Dawid :-) but I know enough, perhaps more than most as I've done some major git surgery on some project splits/mergers and my Stackoverflow answer [here](https://stackoverflow.com/a/17867910/92186) gets upvoted frequently. I recommend _not_ merging master into the feature branch to keep it up to-date because I have not seen positive experiences with that -- mainly the PR is hard/impossible to review at that point. I'd love to be proven wrong here! Just accept that it's not up to date. But sometimes we _really_ want to get a PR up to date because we think/know there are changes that likely impact the PR. In this case, I'd rebase the feature branch from master then force push... but do that sparingly because it kind of somewhat resets the review process, as it's hard to see what you changed when bringing it up to date. It can be helpful to add a comment to mention where the more interesting conflict resolution points were (if any). You might do this rebase & force push _after_ the reviews so that you can address non-trivial conflicts from master. No doubt, when reading about Git, you will hear a lot of "never" do this/that but it's really more of an "avoid" rather than "never". If you are af raid to force push, then read about it and try it out. You're on a fork, so a major screw-up would be contained. FWIW I do all this stuff from the IntelliJ IDE, which I think is excellent. I can screen-share with you if if you like (Slack DM me); I'd love to help you out here or really anyone. ---------------------------------------------------------------- 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: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
