mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-01-28 07:03:17 +08:00
Merge Conflict Resolved
This commit is contained in:
parent
d65191f6c1
commit
827808dca3
@ -257,10 +257,10 @@ export const merge = function (otherBranch, custom_id, override_type, custom_tag
|
|||||||
|
|
||||||
export const cherryPick = function (sourceId, targetId, tag, parentCommitId) {
|
export const cherryPick = function (sourceId, targetId, tag, parentCommitId) {
|
||||||
log.debug('Entering cherryPick:', sourceId, targetId, tag);
|
log.debug('Entering cherryPick:', sourceId, targetId, tag);
|
||||||
sourceId = common.sanitizeText(sourceId, configApi.getConfig());
|
sourceId = common.sanitizeText(sourceId, getConfig());
|
||||||
targetId = common.sanitizeText(targetId, configApi.getConfig());
|
targetId = common.sanitizeText(targetId, getConfig());
|
||||||
tag = common.sanitizeText(tag, configApi.getConfig());
|
tag = common.sanitizeText(tag, getConfig());
|
||||||
parentCommitId = common.sanitizeText(parentCommitId, configApi.getConfig());
|
parentCommitId = common.sanitizeText(parentCommitId, getConfig());
|
||||||
|
|
||||||
if (!sourceId || commits[sourceId] === undefined) {
|
if (!sourceId || commits[sourceId] === undefined) {
|
||||||
let error = new Error(
|
let error = new Error(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user