These are chat archives for elliottminns/blackfish

7th
Mar 2016
Pierre Abi-aad
@abiaad
Mar 07 2016 08:47
hope my pull request commits will satisfy you ahah 😅
Elliott Minns
@elliottminns
Mar 07 2016 14:55
Good work man, I just checked it out
There's some merge conflicts that need to be addressed
Pierre Abi-aad
@abiaad
Mar 07 2016 14:58
thx ;)
where ?
how can I fix that ?
Elliott Minns
@elliottminns
Mar 07 2016 14:58
Just pull from master on the branch and go through the merge conflicts :P)
:)*
Pierre Abi-aad
@abiaad
Mar 07 2016 14:58
ahah ok
from my fork I just do a git pull origin master ?
Elliott Minns
@elliottminns
Mar 07 2016 15:01
Yep
Pierre Abi-aad
@abiaad
Mar 07 2016 15:01
because when i do that all is up to date
Pierre Abi-aad
@abiaad
Mar 07 2016 17:24
thx ;)
Elliott Minns
@elliottminns
Mar 07 2016 17:24
haha, no problem. I also needed the json status for my new project :)
Pierre Abi-aad
@abiaad
Mar 07 2016 17:25
I need geo point for MongoDb now ^^
Elliott Minns
@elliottminns
Mar 07 2016 17:25
I've decided to use blackfish as my mobile backend which should help it reach production
I'll need that also
Pierre Abi-aad
@abiaad
Mar 07 2016 17:25
i never work with mongo
Elliott Minns
@elliottminns
Mar 07 2016 17:26
I have, but via Mongoose
Pierre Abi-aad
@abiaad
Mar 07 2016 17:26
ok