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

INTL-1228: Attempt to reduce merge conflicts on _intl.dart files #221

Merged
merged 4 commits into from
Apr 19, 2023

Conversation

alanknight-wk
Copy link
Contributor

Motivation

There are still too many merge conflicts on _intl.dart files.

Changes

  • Automatically call 'dart_dev format' on the file. If that fails (most commonly because the repo is not set up for dart_dev) print an error message at the end.
  • Put an extra line break between methods to make it less confusing for the merge algorithm.

Release Notes

Review

See CONTRIBUTING.md for more details on review types (+1 / QA +1 / +10) and code review process.

Please review:

QA Checklist

  • Tests were updated and provide good coverage of the changeset and other affected code
  • Manual testing was performed if needed

Merge Checklist

While we perform many automated checks before auto-merging, some manual checks are needed:

  • A Frontend Frameworks Design member has reviewed these changes
  • There are no unaddressed comments - this check can be automated if reviewers use the "Request Changes" feature
  • For release PRs - Version metadata in Rosie comment is correct

@aviary2-wf
Copy link

Security Insights

No security relevant content was detected by automated scans.

Action Items

  • Review PR for security impact; comment "security review required" if needed or unsure
  • Verify aviary.yaml coverage of security relevant code

Questions or Comments? Reach out on Slack: #support-infosec.

@alanknight-wk alanknight-wk changed the title Attempt to reduce merge conflicts on _intl.dart files INTL-1228: Attempt to reduce merge conflicts on _intl.dart files Apr 19, 2023
@alanknight-wk
Copy link
Contributor Author

QA +1 CI Passes, tried it out on graph_app

@alanknight-wk
Copy link
Contributor Author

@Workiva/release-management-p

Copy link

@rmconsole-wf rmconsole-wf left a comment

Choose a reason for hiding this comment

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

+1 from RM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants