fix(fern): remove dupe fern gen from bad merge #725
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Your org requires the Graphite merge queue for merging into mainYou must have a Graphite account in order to use the merge queue. Sign up using this link. You can enable merging using labels in your Graphite merge queue settings. |
This was referenced Apr 20, 2024
Merged
Merged
This stack of pull requests is managed by Graphite. Learn more about stacking. Join @NathanFlurry and the rest of your teammates on |
This was referenced Apr 20, 2024
AngelOnFira
suggested changes
Apr 20, 2024
AngelOnFira
force-pushed
the
04-09-feat_add_cluster_admin_cli
branch
5 times, most recently
from
15045f1 to
2002c43
Compare
AngelOnFira
force-pushed
the
04-09-feat_add_cluster_admin_cli
branch
2 times, most recently
from
80d9298 to
86befd6
Compare
MasterPtato
approved these changes
Apr 22, 2024
NathanFlurry
force-pushed
the
04-20-fix_fern_remove_dupe_fern_gen_from_bad_merge
branch
from
a5cf5ec to
9de218c
Compare
AngelOnFira
force-pushed
the
04-09-feat_add_cluster_admin_cli
branch
2 times, most recently
from
af792d5 to
8571ee3
Compare
|
Does this need to be restacked? Seems that it's carrying the commits from the branch below it. Might be resolved once I merge mine. |
AngelOnFira
approved these changes
Apr 23, 2024
AngelOnFira
force-pushed
the
04-09-feat_add_cluster_admin_cli
branch
from
8571ee3 to
1c64480
Compare
AngelOnFira
force-pushed
the
04-09-feat_add_cluster_admin_cli
branch
7 times, most recently
from
bf6faef to
5b9ba93
Compare
NathanFlurry
force-pushed
the
04-09-feat_add_cluster_admin_cli
branch
from
5b9ba93 to
5b1de57
Compare
NathanFlurry
changed the base branch from
04-09-feat_add_cluster_admin_cli
to
main
NathanFlurry
force-pushed
the
04-20-fix_fern_remove_dupe_fern_gen_from_bad_merge
branch
from
9de218c to
3a692a8
Compare
Merge activity
|
<!-- Please make sure there is an issue that this PR is correlated to. --> ## Changes <!-- If there are frontend changes, please include screenshots. -->
NathanFlurry
force-pushed
the
04-20-fix_fern_remove_dupe_fern_gen_from_bad_merge
branch
from
3a692a8 to
982d388
Compare
graphite-app
bot
deleted the
04-20-fix_fern_remove_dupe_fern_gen_from_bad_merge
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes