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.

Sign up for GitHub

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

Jump to bottom

Update EditorConfig and Git files #304

Merged
merged 2 commits into from
Jun 11, 2022
Merged

Update EditorConfig and Git files #304

merged 2 commits into from
Jun 11, 2022

Conversation

Nirmal4G
Copy link
Contributor

@Nirmal4G Nirmal4G commented Jun 9, 2022 •
edited
Loading

Info

Extracted from CommunityToolkit/WindowsCommunityToolkit#4234 as the Common Code projects were separated in this new repository.

Changes

  • Remove BOM from all files.

  • Add default Git attributes.

  • Update Git ignores to latest.

  • Merge duplicate EditorConfig rules.

  • Format projects to EditorConfig rules.

  • Fix formatting errors in 'Guard.md' file.

PR Checklist

  • Created a feature branch in your fork
  • Based off latest main branch of toolkit
  • PR doesn't include merge commits (always rebase on top of our main)
  • Header has been added to all new source files (ran build/Update-Headers.ps1)
  • Contains NO breaking changes
  • Code follows all style conventions

Notes

  • Rebase merge please.
  • When merging, please update the commit title to PR title instead of the default Merge pull request #xxxx from repo/branch, and commit message to either PR message or messages of individual commits. The auto-merge option does this by default.

Nirmal4G added 2 commits June 7, 2022 15:36
@Nirmal4G
Remove BOM from all files
0891891 
Renormalize new lines and remove BOM from all files
@Nirmal4G
Update EditorConfig and Git files
5fdbc87 
- Add default Git attributes.
- Update Git ignores to latest.
- Merge duplicate EditorConfig rules.
- Format projects to EditorConfig rules.
- Fix formatting errors in 'Guard.md' file.
@Arlodotexe Arlodotexe requested a review from Sergio0694 June 9, 2022 20:14
@Sergio0694 Sergio0694 added the maintenance ⚙️ Some regular maintenance updates label Jun 11, 2022
Sergio0694
Sergio0694 approved these changes Jun 11, 2022
View reviewed changes
Copy link
Member

@Sergio0694 Sergio0694 left a comment

Choose a reason for hiding this comment

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

This was much easier to review, thank you!
Question: why do you want this to be a rebase merge and not a normal merge like other PRs?

CommunityToolkit.Diagnostics/Generated/Guard.md Outdated Show resolved Hide resolved
@Nirmal4G
Copy link
Contributor Author

Why do you want this to be a rebase merge and not a normal merge like other PRs?

It contains two different changes, that's why. Same for my other PRs. Although they depend on some changes in the previous PR/commit, overall, the changes in every commit are standalone.

@Nirmal4G Nirmal4G requested a review from Sergio0694 June 11, 2022 13:28
@Sergio0694 Sergio0694 merged commit 41abf66 into CommunityToolkit:main Jun 11, 2022
@Sergio0694
Copy link
Member

Thanks! 🙂

@Nirmal4G Nirmal4G deleted the repo/cleanup branch June 11, 2022 13:46
@Nirmal4G Nirmal4G mentioned this pull request Sep 22, 2022
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sergio0694 Sergio0694 Awaiting requested review from Sergio0694

Assignees
No one assigned
Labels
maintenance ⚙️ Some regular maintenance updates
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Nirmal4G @Sergio0694