Conversation
72c90ec to
0f56ed6
Compare
Collaborator
Author
|
I tried the above procedure on #635 and it seems to have gone smoothly. |
0f56ed6 to
b930aed
Compare
b930aed to
225014e
Compare
This was referenced Jan 11, 2019
Closed
Closed
Open
Merged
This was referenced Jun 3, 2021
Merged
bencbartlett
pushed a commit
to bencbartlett/meep
that referenced
this pull request
Sep 9, 2021
Merged
Contributor
|
Just a suggestion, when doing stuff like this, it might be useful to add the commit that only introduces formatting changes to a Some more context here: https://gist.github.com/kateinoigakukun/b0bc920e587851bfffa98b9e279175f2 (same goes for mpb if that PR goes in). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Following up on #657, this PR makes no changes except to run
clang-format -ion all of the C++ code, giving it a uniform formatting. (Previously, the code was a mishmash of styles due to different programmers and editor settings over the years, along with mangled indentation from tab/spaces conversions.)Once this is merge, existing PR's and other branches will have zillions of conflicts, but if you follow a very careful procedure then this can be dealt with automatically:
First rebase onto the previous commit to this one (0545e3f) and fix any conflicts.
Then run
clang-format -ion your code and commit it.Then rebase onto this commit (b99fe3f), ignoring conflicts with
git rebase -XtheirsSummary:
Instructions for rebasing other branches after this PR:
Replace
MYBRANCHbelow with the name of your branch: