Github user PascalSchumacher commented on the issue:
https://github.com/apache/commons-lang/pull/141
Hi Derek,
you should be able to rebase this pull request by following these steps:
* `git remote add upstream https://github.com/apache/commons-lang.git`
* `git checkout master`
* `git pull --rebase upstream`
* `git checkout LANG-1195`
* `git rebase master`
* edit/resolve conflicts
* `git rebase --continue`
* `git push -f`
Now this pull request is rebased onto master.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
