Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Conversation

@NathanFlurry
Copy link
Member

No description provided.

@NathanFlurry NathanFlurry requested a review from Blckbrry-Pi March 6, 2024 07:53
Copy link
Member Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @NathanFlurry and the rest of your teammates on Graphite Graphite

Copy link
Contributor

@Blckbrry-Pi Blckbrry-Pi left a comment

Choose a reason for hiding this comment

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

#53 has conflicting changes that do the same thing (and more), but despite saying "Merged", they're not showing up on main.

Not sure exactly what's up with that, but I think it is the "better" PR to merge.

Copy link
Contributor

#53 has conflicting changes that do the same thing (and more), but despite saying "Merged", they're not showing up on main.

Not sure exactly what's up with that, but I think it is the "better" PR to merge.

image.png

Found the issue— the PR was merged into it's downstack parent AFTER the parent was merged into main.

This seems to have been a graphite issue, but I'm not completely sure how to resolve it.

@NathanFlurry NathanFlurry merged commit 84e2926 into main Mar 7, 2024
Copy link
Member Author

@Blckbrry-Pi i'm merging this, can you manually re-apply (or cherry pick) any changes from the other pr that aren't in here?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants