Open sabman opened 2 years ago
use the following recipe
# Release Tags # v3.7.0 # v3.7.1 # v3.7.2 # v4.0.0 # v4.0.1 # v4.0.2 # v4.1.0 # v4.2.0 # v4.2.1 # v4.3.1 # v4.4.0 # v4.5.0 previous_releasetag="v3.7.0" new_releasetag="v3.7.1" carto_tag="v3.6.2-carto" git checkout -b mapnik-${new_releasetag} tags/${new_releasetag} git smart-merge ${previous_releasetag}-mapnik-${carto_tag} # successfully merge / fix conflicts... git branch -m ${new_releasetag}-mapnik-${carto_tag} git push origin
use the following recipe