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

unix2dos on tests/FlatBuffers.Test/FlatBuffers.Core.Test.csproj #6133

Merged
merged 1 commit into from
Sep 28, 2020

Conversation

Shixiaowei02
Copy link
Contributor

@Shixiaowei02 Shixiaowei02 commented Sep 24, 2020

Due to the problem of the newline format (CRLF), after pulling the latest master branch, it is not possible to switch to the old commit on the unix platform. This commit attempts to fix the problem.

% git checkout v1.12.0
error: Your local changes to the following files would be overwritten by checkout:
	tests/FlatBuffers.Test/FlatBuffers.Core.Test.csproj
Please, commit your changes or stash them before you can switch branches.
Aborting

@google-cla
Copy link

google-cla bot commented Sep 24, 2020

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@Shixiaowei02 Shixiaowei02 changed the title Add newline configuration. unix2dos on tests/FlatBuffers.Test/FlatBuffers.Core.Test.csproj Sep 24, 2020
@aardappel aardappel merged commit 641309a into google:master Sep 28, 2020
ivannp pushed a commit to ivannp/flatbuffers that referenced this pull request Oct 2, 2020
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.

2 participants