Cotix
commented
11 years ago I say we just move it into the main branch. I think everyone had a fair chance to object.
Closed mkilgore closed 11 years ago
Cotix
commented
11 years ago I say we just move it into the main branch. I think everyone had a fair chance to object.
mkilgore
commented
11 years ago I would have to agree. I haven't really seen anything but positive feed-back about it, and pushing it to master will help make sure people don't end-up making changes to the current master code since there isn't really any reason why it won't get replaced at this point.
I do however have a few branches I'd like to send in pull-requests for, they're mostly just fixes for small bugs which are present that I wanted to fix. If you wouldn't mind pulling those in before merging reddit-api into master, it would be appreciated. I already did a test merge of all four locally on my computer and they merged together cleanly and everything still builds fine, so they shouldn't cause any problems.
Edit: Just noticed I forgot to rebase on-top of the latest reddit-api before pushing, so I'm pushing from one commit behind your reddit-api copy. It shouldn't cause any problems, that commit just updated some Makefile stuff which I didn't touch in any of my commits, but if it is a problem merge-wise just let me know and I can rebase them so they merge cleanly.
Cotix
commented
11 years ago Merged.
The question of when to merge reddit-api into master was posed by Cotix over on issue #28, and I've been wondering it as well. The code in reddit-api is not perfect, and I don't think that, besides me, anybody has really looked very closely at all the new code I've added. Noting that, the code is still able to do everything and more that master can do right now, even with it missing features and having some bugs here and there.
If possible, I'd like to hear any problems, concerns, recommendations, that you may have about merging reddit-api into master, and when you think a good time to do so would be.