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.

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

state pull should use the already-merged commit's build script instead of attempting a merge. #3608

Merged
merged 1 commit into from
Dec 2, 2024

Conversation

mitchell-as
Copy link
Contributor

@mitchell-as mitchell-as commented Nov 26, 2024

BugDX-3175 `state pull` with merge in history causes buildscript panic

There will be no strategy, and lead to a nil-pointer exception.

…ead of attempting a merge.

There will be no strategy, and lead to a nil-pointer exception.
@mitchell-as mitchell-as requested a review from MDrakos November 26, 2024 20:41
@mitchell-as mitchell-as marked this pull request as ready for review November 26, 2024 20:41
@mitchell-as mitchell-as merged commit e554f37 into version/0-48-0-RC1 Dec 2, 2024
12 of 16 checks passed
@mitchell-as mitchell-as deleted the mitchell/dx-3175 branch December 2, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants