gerlowskija commented on PR #1471: URL: https://github.com/apache/solr/pull/1471#issuecomment-1511768601
> Is there another way to pull in changes, without needing to force push? Yep, definitely! IMO this stuff can be tricky to explain (or read about) through text alone. Everyone's git settings and repo tends to be just different enough that sharing workflow-commands alone can cause as much confusion as it clears up. Anyway, if this explanation doesn't help I'm happy to do a screenshare to discuss as well. (My email address should be on my GH profile) But here goes! ---- Let's say I have a feature branch (`my-feature`) on a Github fork repo (`myfork`), and I want to pull in some changes from the `main` branch in the Apache repo (`origin`). * The first step is to update your local copy of `main` so that it matches the latest stuff upstream: * `git checkout main` * `git pull origin main * Now that your local copy of `main` is up to date, you can merge those changes into your feature branch * `git checkout my-feature` * `git merge main` * (Optionally fix any merge conflicts that might've arisen and `git commit` when you're happy) * Your local `my-feature` branch now has the changes from `main`, we just need to publish your updated branch upstream: * `git push myfork my-feature:my-feature` Hope that helps! -- 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...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org