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

Update tpcsd #262

Closed
wants to merge 6 commits into from
Closed

Update tpcsd #262

wants to merge 6 commits into from

Conversation

danieljeans
Copy link
Contributor

@danieljeans danieljeans commented Jan 11, 2023 •
edited by andresailer
Loading

BEGINRELEASENOTES

  • TPCSD: Fix crash when "previous step" was undefined

ENDRELEASENOTES

@tmadlener
Copy link
Contributor

There is currently a merge conflict, because #261 was squashed before merging, and so git gets confused by the presence of the old commits. Could you resolve these conflicts? I think the easiest is probably to simply cherry-pick the two new commits from this branch.

@danieljeans
Copy link
Contributor Author

Thanks for explaining the issue. I will close this and open a new one with just the new commits.

@danieljeans
Copy link
Contributor Author

cleaned up pull request : #263

@danieljeans danieljeans mentioned this pull request Jan 13, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@danieljeans @tmadlener