Skip to content

Commit cd8b35e

Browse files
test: fix conflict
1 parent fe6afbd commit cd8b35e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/utils/deploy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export async function executeDeploy(
147147
org,
148148
// mdapi format deploys don't require a project, but at this point we need one
149149
project: project ?? (await SfProject.resolve()),
150-
subscribeSDREvents: !opts['dry-run'],
150+
subscribeSDREvents: opts['dry-run'] ? false : true,
151151
ignoreConflicts: opts['ignore-conflicts'],
152152
});
153153
registry = stl.registry;

test/commands/deploy/metadata/quick.nut.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ describe('deploy metadata quick NUTs', () => {
126126

127127
it('should fail to deploy previously deployed deployment', async () => {
128128
const first = await testkit.execute<DeployResultJson>('project:deploy:start', {
129-
args: '--source-dir force-app',
129+
args: '--source-dir force-app --ignore-conflicts',
130130
json: true,
131131
exitCode: 0,
132132
});

0 commit comments

Comments
 (0)