Keep same surrounding whitespace when re-annotating a file #573
Conversation
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
|
@CyborgMaster please rebase and resolve conflicts. Thanks! |
|
On it. Weird, I thought I structured this such that if you merged the previous one first it would just work... hmm... did something unusual happen with the merge? |
CyborgMaster
force-pushed
the
keep-same-whitespace
branch
from
496878a to
1cd6f2c
Compare
|
rebased! |
|
@CyborgMaster Sorry for the extra work. I generally prefer to use "Squash and Merge" option which didn't work out for this scenario. |
|
ah hah, that makes sense. No problem. I'll take care of it as well on the last PR. |
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.
This fixes #555, fixes #472, and possibly more.
This is currently built on top of #571, because it hits the same lines of code. If for some reason you want to merge this one and not #571, I'll be happy to refactor.