aromanenko-dev commented on PR #17111: URL: https://github.com/apache/beam/pull/17111#issuecomment-1164665953
@Lizzfox > Could you tell me please what you mean exactly? You need to rebase your feature branch with `master` branch (e.g. `git checkout <feature-branch> && git rebase`). It will put your commit(s), that you committed in your feature, on top of `master` branch. Also, it's usually better to have your local `master` up-to-date with `origin` one (e.g. `git checkout master && git fetch origin && git pull`). And, please, avoid merge `master` branch into your feature branch, use `git rebase` instead, as I mentioned above. > Do we need to squash the published comments into one or do we need to merge them before pushing them to a remote repository? Yes, you need to squash all commits into one or into several logical ones with a proper commit message. That will help to keep commits history more clear and evident. Also, it should be much easier to rollback such changes if needed. > Could the person who will be merging the PR use the squash and merge option? Yes, it's possible, but it will squash all your commits into only one and the squashed commits should not contain merge commits (like it has for now, as I can see). Feel free to ping me on `the-asf` channel on Slack if you have more questions on this! -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
