You are viewing a plain text version of this content. The canonical link for it is here.

Posted to issues@commons.apache.org by GitBox <gi...@apache.org> on 2022/02/20 14:52:50 UTC

[GitHub] [commons-codec] aherbert commented on pull request #113: CODEC-285-JUnit5

aherbert commented on pull request #113:
URL: https://github.com/apache/commons-codec/pull/113#issuecomment-1046254903


   You can fetch the master and then rebase on that. On the command line:
   ```
   git fetch origin/master
   git rebase origin/master
   ```
   The rebase attempts to collect all your commits and apply them sequentially to the master. If this is not possible the rebase will warn about the conflicts. You then fix those locally and continue with the rebase, IIRC `git rebase --continue`.
   
   Eventually you should end up with a set of changes that can be applied directly onto the master branch. You then force push the changes to this PR branch to update it: `git push -f`.
   
   


-- 
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: issues-unsubscribe@commons.apache.org

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