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

Add and apply scalafmt #122

Merged
merged 2 commits into from
Jan 26, 2024
Merged

Conversation

mdedetrich
Copy link
Collaborator

@mdedetrich mdedetrich commented Jan 25, 2024

Although there are other PR's open its highly likely they are still dead and/or they are trivial in size and with the amount of work being done on sbt-osgi its best to get the formatter in sooner rather than later.

As always, if you are going to merge make sure to do either a "Create a merge Commit" or "Rebase and Merge" but not "Squash and Merge" since I need to add the format commit byitself to a .git-blame-ignore-revs. After PR is merged you can also add a branch check for the Code is formatted to prevent unformatted PR's being merged into main.

Copy link
Member

@SethTisue SethTisue left a comment

Choose a reason for hiding this comment

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

no objection here, but let's wait a bit to see if the other two reviewers object

@mdedetrich
Copy link
Collaborator Author

Sure thing, I have been doing the same in other sbt community plugins so it shouldn't be controversial

@SethTisue
Copy link
Member

As always, if you are going to merge make sure to do either a "Create a merge Commit" or "Rebase and Merge" but not "Squash and Merge"

I just disabled squash merging in the repo settings.

Copy link
Member

@mkurz mkurz left a comment

Choose a reason for hiding this comment

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

I am too tired to review in depth, but totally trust you guys.

@mdedetrich mdedetrich merged commit c0eac3b into sbt:main Jan 26, 2024
11 checks passed
@mdedetrich mdedetrich deleted the add-and-appply-scalafmt branch January 26, 2024 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants