Ah, I see. `git push` is shorthand for `git push origin master`, where "origin" is your repository, and "master" is the branch.

You need to add my repository ("upstream" by convention) as a remote, then pull from *it*.

    git remote add upstream https://github.com/adambard/learnxinyminutes-docs

And then:

    git pull upstream master

This will probably say some things about the java file being in conflict, so then you'll have to edit it. You'll probably see something like this:

    <<<<<< upstream
       (changes in my version)
    ======
       (changes in your version)
    >>>>>>

Just replace those lines with whatever is supposed to be there, `git add` the file, and then push to your repository and it'll show up here. Then, I should be able to merge it.