Yes, it has been removed, but that change is already on master and shouldn't be 
part of your commit. To fix the commit (since you should only have changes in 
the `oneandone` folder) you can do the following in your branch:

``` bash
git reset HEAD~1     # Put the changes int he commit back to staging
git add oneandone  # Just add the changes in the OneAndOne api
git checkout -- .       # Discard the rest
git commit -m "JCLOUDS-1154 oneandone-publicip-api"   # Commit the changes
git fetch origin   # Assuming "origin" is the remote that points to jclouds and 
not your fork
git rebase origin/master   # Put your commits on top of the latest master 
version of jclouds
```

After this you should have the commit in a clean state and on top of the latest 
version of master. If it looks OK, you can push (you'll have to force it with 
`-f`) to your branch.



-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/310#issuecomment-244015311

Reply via email to