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

Fixed crashes when dir parallel to z axis #285

Merged
merged 2 commits into from
Sep 1, 2022
Merged

Conversation

jovoy
Copy link
Contributor

@jovoy jovoy commented Aug 31, 2022

jovoy Ok: 10

@jovoy jovoy requested a review from jgalan August 31, 2022 13:39
@jgalan
Copy link
Member

jgalan commented Aug 31, 2022

This PR is 35 commits behind master, thats probably the reason why the pipeline is failing.

You should merge master in your local branch true_wolter_interaction and then push it.

git merge origin/master
git push

Sometimes it might be required to change to the local master and pull it.

git checkout master
git pull
git checkout true_wolter_interaction
git merge master
git push

@jgalan jgalan merged commit cd5eb1a into master Sep 1, 2022
@jgalan jgalan deleted the true_wolter_interaction branch September 1, 2022 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants