lhotari commented on pull request #9884:
URL: https://github.com/apache/pulsar/pull/9884#issuecomment-800107642


   > I rebased my master (pull request origins from there) but I may have 
messed it up as too many files show up as changed (due to the other commits in 
my rebase).
   
   @fmiguelez  In your pull request branch you can get back to the previous 
revision 03dbcc31495 with this command
   ```
   git reset --hard 03dbcc31495
   ```
   
   the commands for rebasing depend on what the remote name for the 
apache/pulsar repository you have. If you are using "apache" as the name ([as 
suggested in the contributing 
guide](https://pulsar.apache.org/en/contributing/)), it would be these commands 
to rebase:
   ```
   git fetch apache  
   git rebase apache/master
   # if there are merge conflicts:
   git mergetool
   git rebase --continue
   ```
   you then will need to do a force push to update the PR branch when pushing.
   
   I see that you are using the master branch of your fork as the PR branch. 
That's fine for now, but it's better to have a new branch for each PR you open 
since that way you can work on multiple PRs at the same time.
   
   I hope this 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.

For queries about this service, please contact Infrastructure at:
[email protected]


Reply via email to