Closed wvmarle closed 11 years ago
If you are having problems, just send patches next time. Create patches for every change and post it next to bug and i will merge mentioning you. Thanks!
How is this resolved now? Did you put the changes into https://github.com/uskudnik/amazon-glacier-cmd-interface/pull/54 ?
I see all commits appearing there so it seems that's good. Closing this one.
I have a lot of pull requests but github is messing it up.
I have now done commits to my own branches of master and glacier_lib.
I want to do a pull request on some changes to my master but then github says I can't because there are pull requests open already. But those pull requests are from a different branch!
How to fix this that I can get my patches through? Hereby the links.
Solving merge conflicts: https://github.com/wvmarle/amazon-glacier-cmd-interface/commit/038ddedb5b037c1c4c4a96ef1e878d3c765942d4
After pushing found out I did something wrong, then it's nigh impossible to undo that push, so hereby a patch fix patch with some more fixes. https://github.com/wvmarle/amazon-glacier-cmd-interface/commit/843c61566746485d49c2bc8408541e6fd62e7604
One issue is with next_power_of_2() which fails for small files.
And uskudnik maybe you can just reject/invalidate/whatever all my pull requests? I can't find a way to delete them myself allowing me to start again.