Debugging doc updates #3
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…load plugins in non-web situations (scripts, cron jobs, etc.).
Conflicts: docs/appdev.rst webware/MockApplication.py webware/PlugInLoader.py webware/__init__.py
|
Should be rectified by a squash merge. You probably didn't pull the latest changes from upstream and based your feature branch on that. The new changes are only in appdev.rst, right? |
|
Yes, correct. The PR shows 5 commits, but only appdev.rst changed (in only 1 of the commits). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added some documentation on debugging servlets using pdb.
It seems my recent merge commits are showing up in this PR even though there are no net changes. Can you squash them when merging, or do I somehow need to clean up on my end and re-submit?