Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

converted sep 002 to rst #631

Merged
merged 3 commits into from Mar 7, 2014
Merged

converted sep 002 to rst #631

merged 3 commits into from Mar 7, 2014

Conversation

@aspidites
Copy link
Contributor

@aspidites aspidites commented Mar 6, 2014

More work toward #629

@pablohoffman
Copy link
Member

@pablohoffman pablohoffman commented Mar 7, 2014

can you remove the trac file?

@aspidites
Copy link
Contributor Author

@aspidites aspidites commented Mar 7, 2014

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?

@pablohoffman
Copy link
Member

@pablohoffman pablohoffman commented Mar 7, 2014

why would it cause merge conflicts if they all touch different files?. It's one SEP per pull request, isn't it?

@aspidites
Copy link
Contributor Author

@aspidites aspidites commented Mar 7, 2014

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:
sep/sep-001.rst

In aspidites/sep-002.rst:
sep/sep-001.trac

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.

@aspidites
Copy link
Contributor Author

@aspidites aspidites commented Mar 7, 2014

Ah. Just did a local test. No merge conflict after all. I'll update the respective pull requests

pablohoffman added a commit that referenced this pull request Mar 7, 2014
converted sep 002 to rst
@pablohoffman pablohoffman merged commit c9c4343 into scrapy:master Mar 7, 2014
1 check passed
1 check passed
default The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.