Skip to content

style fix

d8e9596
Select commit
Loading
Failed to load commit list.
Open

SampleDocs add epochAdjustment #597

style fix
d8e9596
Select commit
Loading
Failed to load commit list.
Symbol-Github-Bot / Jenkins - Docs failed Feb 26, 2026 in 3m 35s

Declarative: Checkout SCM: error in 'checkout' step

Declarative: Checkout SCM / Check out from version control

Error in checkout step.

hudson.plugins.git.GitException: Command "git merge 90d38137ecdf5db53cb27ba4e9f9e288845f1610" returned status code 1:
stdout: Auto-merging source/resources/examples/typescript/aggregate/AddingCosignaturesAggregateComplete.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/AddingCosignaturesAggregateComplete.ts
Auto-merging source/resources/examples/typescript/aggregate/CreatingAnEscrowContractWithAggregateBondedTransaction.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/CreatingAnEscrowContractWithAggregateBondedTransaction.ts
Auto-merging source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateBonded.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateBonded.ts
Auto-merging source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateComplete.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateComplete.ts
Auto-merging source/resources/examples/typescript/blockchain/GettingBlockByHeight.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingBlockByHeight.ts
Auto-merging source/resources/examples/typescript/blockchain/GettingBlockchainHeight.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingBlockchainHeight.ts
Auto-merging source/resources/examples/typescript/blockchain/GettingTheCurrentMosaicIdentifierBehindANamespace.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingTheCurrentMosaicIdentifierBehindANamespace.ts
Auto-merging source/resources/examples/typescript/blockchain/GettingTheMosaicIdentifierBehindANamespaceWithReceipts.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingTheMosaicIdentifierBehindANamespaceWithReceipts.ts
Auto-merging source/resources/examples/typescript/blockchain/ListeningNewBlocks.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/ListeningNewBlocks.ts
Auto-merging source/resources/examples/typescript/metadata/AssigningMetadataToAMosaic.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/metadata/AssigningMetadataToAMosaic.ts
Auto-merging source/resources/examples/typescript/metadata/AssigningMetadataToANamespace.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/metadata/AssigningMetadataToANamespace.ts
CONFLICT (modify/delete): source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.js deleted in HEAD and modified in 90d38137ecdf5db53cb27ba4e9f9e288845f1610.  Version 90d38137ecdf5db53cb27ba4e9f9e288845f1610 of source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.js left in tree.
CONFLICT (modify/delete): source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.ts deleted in HEAD and modified in 90d38137ecdf5db53cb27ba4e9f9e288845f1610.  Version 90d38137ecdf5db53cb27ba4e9f9e288845f1610 of source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.ts left in tree.
Auto-merging source/resources/examples/typescript/mosaic/CreatingAMosaic.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/mosaic/CreatingAMosaic.ts
Auto-merging source/resources/examples/typescript/multisig/ConvertingAnAccountToMultisig.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ConvertingAnAccountToMultisig.ts
Auto-merging source/resources/examples/typescript/multisig/CreatingAMultilevelMultisigAccount.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/CreatingAMultilevelMultisigAccount.ts
Auto-merging source/resources/examples/typescript/multisig/GettingMultisigAccountCosignatories.ts
Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountAddCosignatory.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountAddCosignatory.ts
Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountIncreaseMinApproval.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountIncreaseMinApproval.ts
Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountRemoveCosignatory.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountRemoveCosignatory.ts
Auto-merging source/resources/examples/typescript/namespace/GettingNamespaceInformation.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/GettingNamespaceInformation.ts
Auto-merging source/resources/examples/typescript/namespace/GettingNamespaceRentalFee.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/GettingNamespaceRentalFee.ts
Auto-merging source/resources/examples/typescript/namespace/LinkingANamespaceToAMosaic.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/LinkingANamespaceToAMosaic.ts
Auto-merging source/resources/examples/typescript/namespace/LinkingANamespaceToAnAddress.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/LinkingANamespaceToAnAddress.ts
Auto-merging source/resources/examples/typescript/namespace/RegisteringANamespace.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/RegisteringANamespace.ts
Auto-merging source/resources/examples/typescript/namespace/RegisteringASubnamespace.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/RegisteringASubnamespace.ts
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Build log
The recommended git tool is: git
using credential Symbol-Github-app
Fetching changes from the remote Git repository
Cleaning workspace
Fetching without tags
 > git rev-parse --resolve-git-dir /home/ubuntu/jenkins/workspace/.git # timeout=10
 > git config remote.origin.url https://github.com/Symbol/symbol-docs.git # timeout=10
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
 > git clean -ffdx # timeout=10
 > git submodule foreach --recursive git reset --hard # timeout=10
 > git submodule foreach git clean -fdx # timeout=10
Fetching upstream changes from https://github.com/Symbol/symbol-docs.git
 > git --version # timeout=10
 > git --version # 'git version 2.34.1'
using GIT_ASKPASS to set credentials Github app for Symbol Org
 > git fetch --no-tags --force --progress -- https://github.com/Symbol/symbol-docs.git +refs/pull/597/head:refs/remotes/origin/PR-597 +refs/heads/main:refs/remotes/origin/main # timeout=10
Merging remotes/origin/main commit 90d38137ecdf5db53cb27ba4e9f9e288845f1610 into PR head commit d8e9596f0f4006a34d3e823b4ffc930b5bb68ebe
 > git config core.sparsecheckout # timeout=10
 > git checkout -f d8e9596f0f4006a34d3e823b4ffc930b5bb68ebe # timeout=10
ERROR: Checkout failed
Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to EC2 (ec2-devops aws EC2) - Ubuntu 22.04 AWS Jenkins medium ARM worker (sir-1r4fcc1h)
		at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1916)
		at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:384)
		at hudson.remoting.Channel.call(Channel.java:1108)
		at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.execute(RemoteGitImpl.java:155)
		at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
		at java.base/java.lang.reflect.Method.invoke(Method.java:580)
		at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler.invoke(RemoteGitImpl.java:140)
		at PluginClassLoader for git-client/jdk.proxy130/jdk.proxy130.$Proxy244.execute(Unknown Source)
		at PluginClassLoader for git//jenkins.plugins.git.MergeWithGitSCMExtension.decorateRevisionToBuild(MergeWithGitSCMExtension.java:120)
		at PluginClassLoader for git//hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1161)
		at PluginClassLoader for git//hudson.plugins.git.GitSCM._checkout(GitSCM.java:1311)
		at PluginClassLoader for git//hudson.plugins.git.GitSCM.checkout(GitSCM.java:1277)
		at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:136)
		at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:101)
		at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:88)
		at PluginClassLoader for workflow-step-api//org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:49)
		at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:572)
		at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:317)
		at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)
		at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)
		at java.base/java.lang.Thread.run(Thread.java:1583)
hudson.plugins.git.GitException: Command "git merge 90d38137ecdf5db53cb27ba4e9f9e288845f1610" returned status code 1:
stdout: Auto-merging source/resources/examples/typescript/aggregate/AddingCosignaturesAggregateComplete.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/AddingCosignaturesAggregateComplete.ts
Auto-merging source/resources/examples/typescript/aggregate/CreatingAnEscrowContractWithAggregateBondedTransaction.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/CreatingAnEscrowContractWithAggregateBondedTransaction.ts
Auto-merging source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateBonded.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateBonded.ts
Auto-merging source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateComplete.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateComplete.ts
Auto-merging source/resources/examples/typescript/blockchain/GettingBlockByHeight.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingBlockByHeight.ts
Auto-merging source/resources/examples/typescript/blockchain/GettingBlockchainHeight.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingBlockchainHeight.ts
Auto-merging source/resources/examples/typescript/blockchain/GettingTheCurrentMosaicIdentifierBehindANamespace.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingTheCurrentMosaicIdentifierBehindANamespace.ts
Auto-merging source/resources/examples/typescript/blockchain/GettingTheMosaicIdentifierBehindANamespaceWithReceipts.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingTheMosaicIdentifierBehindANamespaceWithReceipts.ts
Auto-merging source/resources/examples/typescript/blockchain/ListeningNewBlocks.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/ListeningNewBlocks.ts
Auto-merging source/resources/examples/typescript/metadata/AssigningMetadataToAMosaic.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/metadata/AssigningMetadataToAMosaic.ts
Auto-merging source/resources/examples/typescript/metadata/AssigningMetadataToANamespace.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/metadata/AssigningMetadataToANamespace.ts
CONFLICT (modify/delete): source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.js deleted in HEAD and modified in 90d38137ecdf5db53cb27ba4e9f9e288845f1610.  Version 90d38137ecdf5db53cb27ba4e9f9e288845f1610 of source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.js left in tree.
CONFLICT (modify/delete): source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.ts deleted in HEAD and modified in 90d38137ecdf5db53cb27ba4e9f9e288845f1610.  Version 90d38137ecdf5db53cb27ba4e9f9e288845f1610 of source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.ts left in tree.
Auto-merging source/resources/examples/typescript/mosaic/CreatingAMosaic.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/mosaic/CreatingAMosaic.ts
Auto-merging source/resources/examples/typescript/multisig/ConvertingAnAccountToMultisig.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ConvertingAnAccountToMultisig.ts
Auto-merging source/resources/examples/typescript/multisig/CreatingAMultilevelMultisigAccount.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/CreatingAMultilevelMultisigAccount.ts
Auto-merging source/resources/examples/typescript/multisig/GettingMultisigAccountCosignatories.ts
Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountAddCosignatory.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountAddCosignatory.ts
Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountIncreaseMinApproval.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountIncreaseMinApproval.ts
Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountRemoveCosignatory.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountRemoveCosignatory.ts
Auto-merging source/resources/examples/typescript/namespace/GettingNamespaceInformation.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/GettingNamespaceInformation.ts
Auto-merging source/resources/examples/typescript/namespace/GettingNamespaceRentalFee.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/GettingNamespaceRentalFee.ts
Auto-merging source/resources/examples/typescript/namespace/LinkingANamespaceToAMosaic.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/LinkingANamespaceToAMosaic.ts
Auto-merging source/resources/examples/typescript/namespace/LinkingANamespaceToAnAddress.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/LinkingANamespaceToAnAddress.ts
Auto-merging source/resources/examples/typescript/namespace/RegisteringANamespace.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/RegisteringANamespace.ts
Auto-merging source/resources/examples/typescript/namespace/RegisteringASubnamespace.ts
CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/RegisteringASubnamespace.ts
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2848)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2189)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2083)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2074)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:993)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:173)
	at PluginClassLoader for git-client//org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$GitCommandMasterToSlaveCallable.call(RemoteGitImpl.java:164)
	at hudson.remoting.UserRequest.perform(UserRequest.java:225)
	at hudson.remoting.UserRequest.perform(UserRequest.java:50)
	at hudson.remoting.Request$2.run(Request.java:391)
	at hudson.remoting.InterceptingExecutorService.lambda$wrap$0(InterceptingExecutorService.java:81)
	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
	at java.base/java.lang.Thread.run(Thread.java:840)
Caused: java.io.IOException
	at PluginClassLoader for git//hudson.plugins.git.GitSCM.checkout(GitSCM.java:1279)
	at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep.checkout(SCMStep.java:136)
	at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:101)
	at PluginClassLoader for workflow-scm-step//org.jenkinsci.plugins.workflow.steps.scm.SCMStep$StepExecutionImpl.run(SCMStep.java:88)
	at PluginClassLoader for workflow-step-api//org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:49)
	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:572)
	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:317)
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144)
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642)
	at java.base/java.lang.Thread.run(Thread.java:1583)
ERROR: Maximum checkout retry attempts reached, aborting
 > git remote # timeout=10
 > git config --get remote.origin.url # timeout=10
using GIT_ASKPASS to set credentials Github app for Symbol Org
 > git merge 90d38137ecdf5db53cb27ba4e9f9e288845f1610 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f d8e9596f0f4006a34d3e823b4ffc930b5bb68ebe # timeout=10

Details

  • Declarative: Checkout SCM (7.2 sec)
    Error: *hudson.plugins.git.GitException: Command "git merge 90d3813" returned status code 1:
    stdout: Auto-merging source/resources/examples/typescript/aggregate/AddingCosignaturesAggregateComplete.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/AddingCosignaturesAggregateComplete.ts
    Auto-merging source/resources/examples/typescript/aggregate/CreatingAnEscrowContractWithAggregateBondedTransaction.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/CreatingAnEscrowContractWithAggregateBondedTransaction.ts
    Auto-merging source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateBonded.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateBonded.ts
    Auto-merging source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateComplete.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/aggregate/SendingAMultisigTransactionAggregateComplete.ts
    Auto-merging source/resources/examples/typescript/blockchain/GettingBlockByHeight.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingBlockByHeight.ts
    Auto-merging source/resources/examples/typescript/blockchain/GettingBlockchainHeight.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingBlockchainHeight.ts
    Auto-merging source/resources/examples/typescript/blockchain/GettingTheCurrentMosaicIdentifierBehindANamespace.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingTheCurrentMosaicIdentifierBehindANamespace.ts
    Auto-merging source/resources/examples/typescript/blockchain/GettingTheMosaicIdentifierBehindANamespaceWithReceipts.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/GettingTheMosaicIdentifierBehindANamespaceWithReceipts.ts
    Auto-merging source/resources/examples/typescript/blockchain/ListeningNewBlocks.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/blockchain/ListeningNewBlocks.ts
    Auto-merging source/resources/examples/typescript/metadata/AssigningMetadataToAMosaic.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/metadata/AssigningMetadataToAMosaic.ts
    Auto-merging source/resources/examples/typescript/metadata/AssigningMetadataToANamespace.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/metadata/AssigningMetadataToANamespace.ts
    CONFLICT (modify/delete): source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.js deleted in HEAD and modified in 90d3813. Version 90d3813 of source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.js left in tree.
    CONFLICT (modify/delete): source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.ts deleted in HEAD and modified in 90d3813. Version 90d3813 of source/resources/examples/typescript/monitor/TurningTheAsynchronousTransactionAnnouncementIntoSynchronous.ts left in tree.
    Auto-merging source/resources/examples/typescript/mosaic/CreatingAMosaic.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/mosaic/CreatingAMosaic.ts
    Auto-merging source/resources/examples/typescript/multisig/ConvertingAnAccountToMultisig.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ConvertingAnAccountToMultisig.ts
    Auto-merging source/resources/examples/typescript/multisig/CreatingAMultilevelMultisigAccount.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/CreatingAMultilevelMultisigAccount.ts
    Auto-merging source/resources/examples/typescript/multisig/GettingMultisigAccountCosignatories.ts
    Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountAddCosignatory.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountAddCosignatory.ts
    Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountIncreaseMinApproval.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountIncreaseMinApproval.ts
    Auto-merging source/resources/examples/typescript/multisig/ModifyingAMultisigAccountRemoveCosignatory.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/multisig/ModifyingAMultisigAccountRemoveCosignatory.ts
    Auto-merging source/resources/examples/typescript/namespace/GettingNamespaceInformation.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/GettingNamespaceInformation.ts
    Auto-merging source/resources/examples/typescript/namespace/GettingNamespaceRentalFee.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/GettingNamespaceRentalFee.ts
    Auto-merging source/resources/examples/typescript/namespace/LinkingANamespaceToAMosaic.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/LinkingANamespaceToAMosaic.ts
    Auto-merging source/resources/examples/typescript/namespace/LinkingANamespaceToAnAddress.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/LinkingANamespaceToAnAddress.ts
    Auto-merging source/resources/examples/typescript/namespace/RegisteringANamespace.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/RegisteringANamespace.ts
    Auto-merging source/resources/examples/typescript/namespace/RegisteringASubnamespace.ts
    CONFLICT (content): Merge conflict in source/resources/examples/typescript/namespace/RegisteringASubnamespace.ts
    Automatic merge failed; fix conflicts and then commit the result.

stderr: * - logs

  • Declarative: Post Actions (6 sec)