Implement Repository Comments API

[wfroese]

See issue #332 for details.

[haacked]

Looks good! Just merge in (or rebase against) master so I can hit that green button. :)

[wfroese]

Is that what you were looking for?

[haacked]

Hmm, I still can't merge it. It says there are conflicts. Did you make sure to fetch latest?

[wfroese]

I did. The commit history looks like it contains everything in master as well. And now the build is failing too, so I'll look into that...

[haacked]

^^^ That's what I'm seeing. That indicates that your branch isn't up to date with master on the server.

[wfroese]

It looks like the latest thing merged into master is pull request #410, and the build is now telling me that a file from that commit is missing in Octokit-MonoAndroid.csproj, Octokit-Monotouch.csproj, etc.

Not really sure where to go from here...

[haacked]

Try running

.\build.cmd FixProjects

[haacked]

And then commit those changes and push.

[wfroese]

If it still won't let you merge, then I'm at a loss unfortunately. Doing a fetch does nothing (because it's presumably up to date), and the same happens for merging master into this branch.

[haacked]

Ok, I'll take a look at it tomorrow.

[haacked]

So it looks like you pushed it in a conflicted state. When I pulled it locally, there was still a merge conflict left to resolve. I resolved it and pushed it to a new branch.

[haacked]

thanks for your contribution!

[wfroese]

Oh geez. Thanks Phil!