Skip to content

[release/9.0.1] VMR Sync failing with a CRLF issue #5252

@Winniexu01

Description

@Winniexu01

Related to #5207

https://dev.azure.com/dnceng/internal/_build/results?buildId=2731821&view=results (internal Microsoft link)

CRLF issue:

fail: Failed to synchronize repo sdk
      Failed to merge work branch sync/sdk/dee5fc1-06843516d09d5f5338a7fc51b44e4edd01c4381a into release/9.0.1xx
      Exit code: 2
      Std err:
      warning: in the working copy of 'src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize.cs', CRLF will be replaced by LF the next time Git touches it
      warning: in the working copy of 'src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize_v1.cs', CRLF will be replaced by LF the next time Git touches it
      warning: in the working copy of 'src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize.csproj', CRLF will be replaced by LF the next time Git touches it
      error: Your local changes to the following files would be overwritten by merge:
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize.cs
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize_v1.cs
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize.csproj
      Please commit your changes or stash them before you merge.
      Aborting
      error: Your local changes to the following files would be overwritten by merge:
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize.cs
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/IncreaseMetadataRowSize_v1.cs
      	src/runtime/src/libraries/System.Runtime.Loader/tests/ApplyUpdate/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize/System.Reflection.Metadata.ApplyUpdate.Test.IncreaseMetadataRowSize.csproj
      Please commit your changes or stash them before you merge.
      Aborting
      Index was not unstashed.
      Merge with strategy ort failed.

Metadata

Metadata

Assignees

No one assigned

    Labels

    ops-monitorIssues created/handled by the source build monitor roleuntriaged

    Type

    No type

    Projects

    Status

    Done

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions