Thanks for letting us know. I have not thought of this, but I can definitely see this happening in our case as well. Separate files in a subdirectory sound as a good workaround. What do the other think? Johannes Schönberger On Aug 14, 2014, at 2:12 PM, Thomas Caswell <tcaswell@gmail.com> wrote:

As a side note, mpl has been doing something similar and having everyone work on the same file leads to a stupendous amount of conflicts. We are moving to having a folder to create files in and then re-assembling them at release time.

Tom

On Thu, Aug 14, 2014 at 12:21 PM, Stéfan van der Walt <stefan@sun.ac.za> wrote:

...

On Thu, Aug 14, 2014 at 1:38 PM, Johannes Sch önberger <jsch@demuc.de> wrote:

...

Just a reminder: before merging a PR in the future, we want to make sure, that the changes are documented in `doc/release/release_dev.txt`.

Ouch, good point--thanks for the reminder.

Stéfan

-- You received this message because you are subscribed to the Google Groups "scikit-image" group. To unsubscribe from this group and stop receiving emails from it, send an email to scikit-image+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.

-- Thomas Caswell tcaswell@gmail.com

-- You received this message because you are subscribed to the Google Groups "scikit-image" group. To unsubscribe from this group and stop receiving emails from it, send an email to scikit-image+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.