sumeetgajjar commented on pull request #32114:
URL: https://github.com/apache/spark/pull/32114#issuecomment-824354174
I was wondering what is policy for merging the latest changes to a
upstream-dev-branch?
For e.g. I have a branch `SPARK-35011` which contains my changes, it is
behind `upstream/master`
- Should I be rebasing my commits on the new changes from `upstream/master`
?
- current branch is `SPARK-35011` -- git pull upstream master --rebase
- In this case when I push my changes to PR, I will require a --force
push since the commit ordering is now changed.
- Or should I merge the upstream/master into `SPARK-35011`?
- current branch is `SPARK-35011` -- git merge upstream/master
- No force push required, however my commits are too far behind in the
history.
--
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:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
