converted sep 002 to rst #631
Conversation
can you remove the trac file? |
Removing the trac files would have caused merge errors between each pull request. I planned to have a final pull request that removed all the trac files once the conversions were done. Is that OK? |
why would it cause merge conflicts if they all touch different files?. It's one SEP per pull request, isn't it? |
I could be wrong, but my logic was that the different branches delete different files, so after each accepted pull request, the deleted file would be attempted to be removed. For example: In scrapy/master: In aspidites/sep-002.rst: Alternatively, I could merge master after each pull request is accepted, but then I'd have to deal with the conflicts. It seemed easier to just remove all the *trac files after everything was done. |
Ah. Just did a local test. No merge conflict after all. I'll update the respective pull requests |
More work toward #629