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

Jump to bottom

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

Open
wants to merge 1 commit into
base: version/0-48-0-RC1
Choose a base branch
from
Open

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

wants to merge 1 commit into from

Conversation

mitchell-as
Copy link
Contributor

@mitchell-as mitchell-as commented Nov 26, 2024 •
edited by github-actions bot
Loading

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

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

@mitchell-as
state pull should use the already-merged commit's build script inst…
fdb87b0 
…ead of attempting a merge.

There will be no strategy, and lead to a nil-pointer exception.
@mitchell-as mitchell-as marked this pull request as ready for review November 26, 2024 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MDrakos MDrakos MDrakos approved these changes

Assignees
No one assigned
Labels
Test: pull
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mitchell-as @MDrakos