Github user HansBrende commented on the issue:
https://github.com/apache/any23/pull/116
@larsgsvensson it looks like you may have rebased in the wrong direction?
One problem is that your master branch is 3 commits ahead of the apache/master
branch. So here's what I would do (before making any more commits):
``` bash
git checkout master
git reset --hard HEAD~3
git pull https://github.com/apache/any23.git master
git push -f origin master
git checkout ANY23-388
git reset --hard HEAD~5
git rebase master
git push -f origin ANY23-388
```
After you do that, then make your changes to the ANY23-388 branch. Then:
```bash
git add .
git commit -m "ANY23-388 [message]"
git push origin ANY23-388
```
Then we should be good to go.
---
