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 fourmolu #595

Merged
merged 4 commits into from
Aug 9, 2024
Merged

Add fourmolu #595

merged 4 commits into from
Aug 9, 2024

Conversation

martijnbastiaan
Copy link
Contributor

@martijnbastiaan martijnbastiaan commented Aug 8, 2024

Rebasing on top of this PR

Rebase on commit before this PR:

git fetch
git rebase f7bfc6c2cd2d9d9789c0a03327eb9b6d5ed96a2c

Finish rebase like normal. Then rebase on top of this PR (+fallout PR):

git rebase 94786b2c0bf501203b41adae367b4a416d8902b4

If you get a merge error during a rebase do:

git checkout --theirs <file1> <file2>

This throws away any changes this PR made (which are mechanical). Then to format your files:

git add -A
format

And continue the rebase like normal.

Finally, rebase on top of staging:

git rebase origin/staging

Repeat this PR

git reset $(git log --grep="Add fourmolu" --pretty=format:"%H") --hard
git rebase origin/staging
format
format # idempotence bugs wohoo
git commit -am "Format files using fourmolu" -m "Closes #548"

echo "# SPDX-FileCopyrightText: 2024 Google LLC"                  >  .git-blame-ignore-revs
echo "#"                                                          >> .git-blame-ignore-revs
echo "# SPDX-License-Identifier: CC0-1.0"                         >> .git-blame-ignore-revs
git log --grep="Format files using fourmolu" --pretty=format:"%H" >> .git-blame-ignore-revs
echo ""                                                           >> .git-blame-ignore-revs
git add .git-blame-ignore-revs
git commit -m "Ignore formatting commit for blame"

@martijnbastiaan martijnbastiaan marked this pull request as ready for review August 8, 2024 10:17
@martijnbastiaan martijnbastiaan force-pushed the add-fourmolu branch 2 times, most recently from 55f6ef7 to c9b033d Compare August 9, 2024 08:48
Copy link
Contributor

@lmbollen lmbollen left a comment

Choose a reason for hiding this comment

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

Wow nice diff

@martijnbastiaan martijnbastiaan merged commit 62d6d98 into staging Aug 9, 2024
30 checks passed
@martijnbastiaan martijnbastiaan deleted the add-fourmolu branch August 9, 2024 10:23
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.

2 participants