healchow commented on PR #7403:
URL: https://github.com/apache/inlong/pull/7403#issuecomment-1438655116

   Hi @e-mhui, I see you committed some unrelated commits in this PR.
   From my practice, you can reset hard from the master branch before pushing 
your commit.
   
   1. `git stash -m "your new codes"` , save your local changes into stash 
stack.
   2. `git pull upstream master` , if there are conflicts, ignore them.
   3. `git reset --hard upstream/master` , this operation will keep your local 
branch the same as the upstream master branch.
   4. `git stash pop` , continue to do your work, and then commit, finally 
create a pull request.


-- 
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: commits-unsubscr...@inlong.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Reply via email to