evolvecmd: the proper way to deal with conflicts is to resolve them
And it's worth making the suggestion an actual hint.
SPHINXBUILD ?= sphinx-build
all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
$(SPHINXBUILD) . ../html/
tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py
python test2rst.py tutorials/
tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py
python test2rst.py tutorials/
static/logo-evolve.ico: static/logo-evolve.svg
convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico