hamperbot / hamper

an irc bot
MIT License
19 stars 42 forks source link

Add testing info in readme; change 'install' to 'develop' #112

Closed maxking closed 9 years ago

maxking commented 9 years ago

Its generally a good idea to use 'develop' when developing inside of a virtualenv instead of 'install'.

mythmon commented 9 years ago

Cool, thanks.

In the future, this is generally easier when you work on a separate branch, instead of on master. If that were the case, you could destroy the branch locally, recreate it with the correct set of commits, and force push that to the branch that the PR was made from on GitHub. That way you don't have to make multiple PRs.

maxking commented 9 years ago

@mythmon I try to avoid force-push even when I know what I am doing. Have had bad experiences with it. I'd rather delete the branch oh Github and re-create it.

mythmon commented 9 years ago

Deleting the branch and recreating it is the same as force pushing now. git push --force in Git 2.0 only deals with the current branch, so it is a lot safer than it used to be (where it had the potential of overwriting other branches). Another helpful thing is git push --force-with-lease which will only override a branch if the remote's current branch matches what your local records expect it to be. That avoids overwriting other people's changes. Though you won't often get that if you work on a personal branch.

maxking commented 9 years ago

Cool, thanks!