search

ionelmc / python-manhole

Debugging manhole for python applications.
https://pypi.python.org/pypi/manhole
BSD 2-Clause "Simplified" License
374 stars 24 forks source link

Way less globals #37

Closed ionelmc closed 10 years ago

ionelmc commented 10 years ago

Lets see if the commit comments appear here

ionelmc commented 10 years ago

I think I've addressed all your comments.

About the merge, my plan is to re-integrate all the small changes from master and then do a "merge --strategy=ours" (discard everything from master). It's way easier that way.

After that I'm going to rebase the remaining PRs on top this.

ionelmc commented 10 years ago

I can squash everything but then we lose all your comments. Ideally you'd look here https://github.com/ionelmc/python-manhole/pull/37/files (it's an equivalent of a squash).

nirs commented 10 years ago

Ok, https://github.com/ionelmc/python-manhole/pull/37/files does help.

nirs commented 10 years ago

Anway, what I do when I want to keep versions, is to create a new branch for each version, for example, see https://github.com/nirs/sanlock - branchs python-events, python-events-1, ...

ionelmc commented 10 years ago

That makes sense if you want to maintain multiple versions at once. You really want version branches?

nirs commented 10 years ago

Reviewing the the pull request diffs is fine for me.