-
Notifications
You must be signed in to change notification settings - Fork 5.4k
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
adding F dist (#15798) #15811
adding F dist (#15798) #15811
Conversation
Looks like you have some unrelated "temp storage" changes in here. I think you need to rebase. |
Code review:
|
@Masha-Iris - please clean up this diff also :) |
@Masha-Iris - could you please fix the "This branch has conflicts that must be resolved" issue? |
Your diff seems to include irrelevant files changes. You'll need to remove them from the diff (or, in worst case scenario, start a new diff with only the changes you want) |
Hey @Masha-Iris - I see that this diff has merge conflicts, could you please resolve them? |
@Masha-Iris - I think this diff wasn't merged properly. I see you have 3 commits in it, and also that it includes adding other diffs as new content within your own diff. Please review. |
@Masha-Iris Can you please take a look at resolving the merge conflicts. |
This pull request has been automatically marked as stale because it has not had recent activity. If you'd still like this PR merged, please comment on the task, make sure you've addressed reviewer comments, and rebase on the latest master. Thank you for your contributions! |
Test plan - (Please fill in how you tested your changes)
Please make sure your submission complies with our Development, Formatting, and Commit Message guidelines. Don't forget to follow our attribution guidelines for any code copied from other projects.
Fill in the release notes towards the bottom of the PR description.
See Release Notes Guidelines for details.
If release note is NOT required, use: