Skip to content

Conversation

cityofships
Copy link
Member

No description provided.

@cityofships cityofships requested a review from a team as a code owner March 8, 2023 13:44
@cityofships cityofships enabled auto-merge March 8, 2023 13:46
markgoddard
markgoddard previously approved these changes Mar 8, 2023
@markgoddard
Copy link
Contributor

Has merge conflict, might need a rebase to pick up CI fix

markgoddard
markgoddard previously approved these changes Mar 15, 2023
@markgoddard
Copy link
Contributor

Merge conflict again :(

@cityofships cityofships force-pushed the yoga-focal-liblasso-upgrade branch from aa02df7 to 604e18a Compare March 21, 2023 09:56
@cityofships cityofships disabled auto-merge March 21, 2023 10:01
@cityofships cityofships marked this pull request as draft March 21, 2023 10:01
@cityofships
Copy link
Member Author

Something went sideways in #443 - one part of this change is merged (build overrides) but not updated image tag.

@cityofships cityofships marked this pull request as ready for review March 21, 2023 10:31
@markgoddard
Copy link
Contributor

Something went sideways in #443 - one part of this change is merged (build overrides) but not updated image tag.

I didn't pull in the tag because I knew you had this PR open. Perhaps I should have done it in the merge instead.

@markgoddard markgoddard force-pushed the yoga-focal-liblasso-upgrade branch from 604e18a to 298153f Compare March 23, 2023 11:34
@markgoddard markgoddard changed the base branch from stackhpc/yoga to yoga_neutron_march March 23, 2023 11:34
Copy link
Contributor

@markgoddard markgoddard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebased onto neutron patch to avoid merge conflicts.

@cityofships cityofships merged commit 81ef21d into yoga_neutron_march Mar 23, 2023
@cityofships cityofships deleted the yoga-focal-liblasso-upgrade branch March 23, 2023 11:43
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.

3 participants