search

scrapinghub / slackbot

A chat bot for Slack (https://slack.com).
MIT License
1.26k stars 394 forks source link

Better Slackbot in Py3 #51

Closed merqurio closed 8 years ago

merqurio commented 8 years ago

OK, this one is a big PR. It includes:

I'm open to any modification you consider necessary + help you maintaining the repo :v:

merqurio commented 8 years ago

I'll work in py3 tests as soon as I can :grin:

lins05 commented 8 years ago

Wow, thanks for the PR! Could you please squash the commits into one commit?

merqurio commented 8 years ago

Sure, how can I do that ?

lins05 commented 8 years ago 
git reset --soft upstream/develop
git commit -a -m "..."
merqurio commented 8 years ago

:+1: Great !

merqurio commented 8 years ago

I think I did it correctly

merqurio commented 8 years ago

Please let me know if you want me to change something :grimacing:

josegonzalez commented 8 years ago

@lins05 bump

lins05 commented 8 years ago

Hi @josegonzalez @merqurio , thanks for the reminder, I have been on vacation for the last days, would take a look soon!

josegonzalez commented 8 years ago

<3 Great to hear :)

merqurio commented 8 years ago

:tada: Happy Chinese new year @lins05 ! :grin:

lins05 commented 8 years ago

@merqurio Yeah, it was the CNY vacation, and it's time to go back to work :)

merqurio commented 8 years ago

Anything else I can do to improve this PR ?

lins05 commented 8 years ago

Nope, please rebase and squash the commits into a single one so that I can merge it.

merqurio commented 8 years ago

Done !

lins05 commented 8 years ago

You didn't get me, there are still 11 commits, please google "how to squash git commits" :)

screen shot 2016-02-17 at 10 41 48 pm

http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git

merqurio commented 8 years ago

Done, but now there is conflicts ? I don't understand why... what should I do ?

lins05 commented 8 years ago

@merqurio You need to rebase and resolve the conflicts. Check https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/ , or do some google yourself.

merqurio commented 8 years ago

Finally... Sorry it took me so many attempts, I'm totally new to this rebase squash workflow !

merqurio commented 8 years ago

I'm getting crazy with this rebase squash thing :angry:

josegonzalez commented 8 years ago

@merqurio I think you aren't squashing it properly. I'll resubmit this pr, squashed against master.

merqurio commented 8 years ago

It should be squashed against develop. I don't get what the f*\ I'm doing wrong

josegonzalez commented 8 years ago

I think you are squashing against your own remote, not against lins05's repository.

merqurio commented 8 years ago

aaaahhmm, it's true, :dizzy_face: thanks @josegonzalez

josegonzalez commented 8 years ago

Can you checkout my pr and make sure it does what it needs to, @merqurio ?

merqurio commented 8 years ago

Sure ! thanks a lot btw; I need to check this rebase squash thing :+1: