search

textile / python-textile

A Python port of Textile, A humane web text generator
Other
68 stars 23 forks source link

Merge master changes into develop branch #32

Closed ikirudennis closed 8 years ago

codecov-io commented 8 years ago

Current coverage is 100% (diff: 100%)

Merging #32 into develop will not change coverage

@@           develop    #32   diff @@
=====================================
  Files           12     12          
  Lines         1198   1418   +220   
  Methods          0      0          
  Messages         0      0          
  Branches       215    308    +93   
=====================================
+ Hits          1198   1418   +220   
  Misses           0      0          
  Partials         0      0

Powered by Codecov. Last update 9c6a190...d629b60

coveralls commented 8 years ago

Coverage Status

Coverage remained the same at 100.0% when pulling d629b608691ebeb41a13bab9ac2d018b9fc95b67 on master into 9c6a190a43c60d5b42d51ef85dacd483a9b8de63 on develop.

sebix commented 7 years ago

Should I push these kind of fixes to both master and develop or only to develop?

ikirudennis commented 7 years ago

I use the git flow branching model (as outlined here. So, develop is the better place to work in, as the flow of merges is a little more streamlined with the system. There should probably be a CONTRIBUTING.md with a note in there about this. I'm currently searching for one to borrow from another project.

If I haven't said it before, thank you for your assistance. It's great having another set of eyes on this project.