tokers commented on pull request #670: URL: https://github.com/apache/apisix-ingress-controller/pull/670#issuecomment-917420502
> I'm used to using `git fetch upstream` and then `git rebase upstream/master` on my local branch so that I can apply my changes on the newest codes from upstream. But then I need to use `git push --force my branch-name` to force pushed the commit to keep a clearly linear commit tree. (clear for me) > This time I try to use `git pull` instead of `git rebase` to avoid force push. But the commits seems weird. The accepted pr has overwrite my changes, and I pushed a new commit to apply all my new changes. > > * So what's the correct steps of this situation? Can I still use `git rebase`? > * btw, if I want to use `git commit --amend`, I need to use `git push --force` as well. Is it acceptable? You don't need release, just merge the master branch is OK, don't be overwhelmed by the extra Merge commit, we use squash merge strategy so finally only a commit will be merged into the master branch and the tree will be clean. -- 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]
