search

kossiitkgp / bhattu

A slack bot for bakar on #random
https://bhattu.kossiitkgp.org
5 stars 8 forks source link

Fixes #2 #10

Closed americast closed 7 years ago

pranitbauva1997 commented 7 years ago

@americast I think there are merge conflicts. Get the latest tip of master and please rebase this branch. After that this can be merged!

americast commented 7 years ago

@pranitbauva1997 Done !

pranitbauva1997 commented 7 years ago

@americast Awesome work dude! Thanks for following this up.

I see you have made this PR from master branch. Please delete the master branch and get the new master branch from upstream. How to do that?

$ git checkout -b random $ git fetch upstream $ git checkout upstream/master $ git checkout -b master $ git push origin master --force

And the job is done. Now your master branch will exactly match the master branch of this repo!