Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: delta after merge is not working as expected #1118

Merged
merged 2 commits into from
Mar 13, 2025
Merged

fix: delta after merge is not working as expected #1118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91295df
fix typo in warning
yan-imensar Mar 11, 2025
9fc838a
inverting HEAD^ and HEAD in smart deployment
yan-imensar Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/commands/hardis/project/deploy/smart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ If testlevel=RunRepositoryTests, can contain a regular expression to keep only c
this.delta = true;
this.smartDeployOptions.delta = true;
// Define delta deployment depending on context
let fromCommit = 'HEAD';
let toCommit = 'HEAD^';
let fromCommit = 'HEAD^';
let toCommit = 'HEAD';
if (this.checkOnly) {
// In deployment check context
const prInfo = await GitProvider.getPullRequestInfo();
Expand Down Expand Up @@ -601,7 +601,7 @@ If testlevel=RunRepositoryTests, can contain a regular expression to keep only c
uxLog(
this,
c.yellow(
`[DeltaDeployment] It is recommended to use delta deployments for merges between major branches, use this config at your own responsibility`
`[DeltaDeployment] It is not recommended to use delta deployments for merges between major branches, use this config at your own responsibility`
)
);
return true;
Expand Down
Loading