Repository navigation
Fix doctring indentation issue in #241 - #289
Conversation
|
We need to implement some indentation tests first. See my comments here #283 If you get the ball rolling on the tests, I'll gladly accept the patch. As it stands, with no indentation tests every change is a potential problem and I'd rather avoid those. |
|
Fair point. I'll look into creating the tests. |
|
@sandhu Ping :-) |
|
Btw, I just added some basic indentation tests to get you started. |
|
@sandhu Did you get around to looking at the tests for this fix? |
|
Sorry. Seem to have missed the ping from @bbatsov as well. Will take a look at them this weekend and update the PR. |
|
Added the doc string indentation tests |
|
Cool. Could you squash the commits? |
|
Done. |
|
There's still an empty merge commit. |
|
I've removed the merge commit, but I now have merge conflicts. Will add it back in. |
|
I've added the merge commit back in since it shows conflicts without it there. |
|
We don't want merge commits polluting our history. In the contribution guidelines there's this link about how to rebase to avoid creating merge commits.
|
|
You should rebase on top of the current master. On Saturday, June 13, 2015, Achint Sandhu notifications@github.com wrote:
Best Regards, |
Added code to only apply the prefix if the current indent level is <= the default prefix spacing.
|
I don't generally rebase since it's not an accurate reflection of the history, but since it's your repo, I'm happy to play along. :-) Just pushed a rebased version. |
Fix doctring indentation issue in #241
|
Thanks! |
|
No worries. Thanks for the merge. |
Added code to only apply the prefix if the current indent level is <=
the default prefix spacing.