Skip to content
New issue

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

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

Already on GitHub? # to your account

[typing] Fix typing errors for argument assignments in appendInStep (backport #5734) #5737

Merged
merged 5 commits into from
Aug 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 28, 2024

Description

#Fixes #5733


This is an automatic backport of pull request #5734 done by [Mergify](https://mergify.com).

…p` (#5734)

(cherry picked from commit 4e9388e)

# Conflicts:
#	src/abaqus/Interaction/MasterSlaveAssignment.py
#	src/abaqus/Interaction/SurfaceFeatureAssignment.py
@mergify mergify bot added 2021 backport Backport pull request created by Mergify conflicts Conflict with its base branch labels Aug 28, 2024
Copy link
Contributor Author

mergify bot commented Aug 28, 2024

Cherry-pick of 4e9388e has failed:

On branch mergify/bp/2021/pr-5734
Your branch is up to date with 'origin/2021'.

You are currently cherry-picking commit 4e9388ed.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/abaqus/Interaction/ContactPropertyAssignment.py
	modified:   src/abaqus/Interaction/InitializationAssignment.py
	modified:   src/abaqus/Interaction/PolarityAssignments.py
	modified:   src/abaqus/Interaction/SlidingFormulationAssignment.py
	modified:   src/abaqus/Interaction/SlidingTransitionAssignment.py
	modified:   src/abaqus/Interaction/SmoothingAssignment.py
	modified:   src/abaqus/Interaction/StabilizationAssignment.py
	modified:   src/abaqus/Interaction/SurfaceBeamSmoothingAssignment.py
	modified:   src/abaqus/Interaction/SurfaceCrushTriggerAssignment.py
	modified:   src/abaqus/Interaction/SurfaceFrictionAssignment.py
	modified:   src/abaqus/Interaction/SurfaceOffsetAssignment.py
	modified:   src/abaqus/Interaction/SurfaceThicknessAssignment.py
	modified:   src/abaqus/Interaction/SurfaceVertexCriteriaAssignment.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/abaqus/Interaction/MasterSlaveAssignment.py
	both modified:   src/abaqus/Interaction/SurfaceFeatureAssignment.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@keywordlabeler keywordlabeler bot added the typing Typing label Aug 28, 2024
@haiiliin haiiliin force-pushed the mergify/bp/2021/pr-5734 branch from 639ce1d to 2a959f0 Compare August 28, 2024 08:36
Copy link
Contributor

Hi @mergify[bot], I have deleted the conflicted deleted files in this pull request. Please check it again. Thanks!

@haiiliin haiiliin removed the conflicts Conflict with its base branch label Aug 28, 2024
@mergify mergify bot merged commit 0bd8686 into 2021 Aug 28, 2024
2 of 3 checks passed
@mergify mergify bot deleted the mergify/bp/2021/pr-5734 branch August 28, 2024 08:47
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
2021 backport Backport pull request created by Mergify typing Typing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant