Closed d-simon closed 7 years ago
Could you rebase this on develop? There was some force-pushing happening for v5.0.0.
"Rebase"
alias rebase="git reset --hard origin/develop && git cherry-pick 67319ca6ed0c8d6d174f4899c49763e2bd4f6765 && git push -f"
How hard can it be?
LGTM
@orioltf great to hear. It saved one of our devs many times. IIRC there is a Rebase&Merge button in gh now. No? 😜 Otherwise I can rebase it tomorrow.
Ah I didn't see the conflicts from mobile, my bad.
I had to remove the npm-shrinkwrap.json
because I wasn't able to get into a conflict free state. @orioltf @backflip Is there a reason we still keep a shrinkwrap json file instead of yarn.lock
?
@d-simon You can have a look at issue #12 However, I bet your comment was meant to be an upcoming PR, right?! 😝
Replaced with https://github.com/unic/estatico/pull/44 with a regenerated npm-shrinkwrap.json
This change adds a node.js version check before running any gulp tasks. The version check is based on the information in the package.json: