Skip to content

Commit e365a46

Browse files
committed
Catching the Netlify ContextualVersionConflict problem
1 parent c2bbfd6 commit e365a46

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ livehtml: deps ## Rebuild Sphinx documentation on changes, with live-reload in
222222
.PHONY: netlify
223223
netlify:
224224
pip install -r requirements.txt
225+
pip install -r requirements-netlify.txt
225226
git submodule init; \
226227
git submodule update; \
227228
pip install -e submodules/plone.api[test]; \

requirements-netlify.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
setuptools==42.0.2
2+
zc.buildout==2.13.3

0 commit comments

Comments
 (0)