…e dependencies

…deployed-for-inter-type-dependencies

# Conflicts:
#	@types/lib/index.d.ts.map
#	@types/lib/metadataTypes/Asset.d.ts.map
#	@types/lib/metadataTypes/MetadataType.d.ts.map
#	@types/lib/util/util.d.ts.map

…deployed-for-inter-type-dependencies

…ighting-for-ssjs-files-in-gitlab

task/1637 enable syntax highlighting for SSJS files in gitlab

…riggeredSends

…-leaves-journeys-with-wrong-emails

bug/1505 fix bad asset links on journeys when retrieved together with triggeredSends

…deployed-for-inter-type-dependencies

# Conflicts:
#	lib/index.js

…al dependencies

…-assets-are-deployed-for-inter-type-dependencies

BUG/1472 adapt order in which assets are deployed for inter-type dependencies

…to-update-files-when-update-is-optional

bug/1646 fix config not getting updated during mcdev upgrade

…m-validation-rules-for-builddefinition-deploy

…v-validations.js

…be truncated"-error

…e-journey

feature/1434 add resume journey via execute-method

…ation_rules_for_buildDefinition_and_deploy

…_for_buildDefinition_and_deploy

Feature/1643 validation rules for build definition and deploy

…m-validation-rules-for-builddefinition-deploy

…n-rules-for-builddefinition-deploy

Feature/1645 custom validation rules for builddefinition deploy

…y-matchname-for-dataextensions

…-for-dataextensions

#1651: allow using --matchName with deploy dataExtension

…-dataextension-fails-with-error-string-or-binary-data-would-be-truncated-the-statement-has-been-terminated

…ion-fails-with-error-string-or-binary-data-would-be-truncated-the-statement-has-been-terminated

bug/1644 workaround, not solution for the "string or binary data would be truncated"-error

…ary-not-deployed-correctly-as-string

…loyed-correctly-as-string

bug/1657 fix eventDataSummary not getting saved correctly

…ple keys are retrieved at once

This reverts commit 5ece335.

…ion-rule-overrides-for-selected-types

Feature/1666 optional validation rule overrides for selected types

…_checks_for_events_and_journeys_fail_if_multiple_entries_are_retrieved_by_key

# Conflicts:
#	@types/lib/metadataTypes/Journey.d.ts.map
#	lib/metadataTypes/Journey.js

…_events_and_journeys_fail_if_multiple_entries_are_retrieved_by_key

Bug/1668 sf object checks for events and journeys fail if multiple entries are retrieved by key

…he were omitted due to templating

…t-message)

… buildDefinitionBulk

…locking-validation-errors-to-warnings

feature/1671 add --skipValidation option to deploy, build, buildDefinition, buildDefinitionBulk

this type uses its own upsert()

…ven if the were omitted due to templating"

This reverts commit a6cb91f.