warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/audioprobe.dsp.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/duplex.dsp.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/playraw.dsp.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/playsaw.dsp.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/record.dsp.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/rtaudio.dsw.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/testall.dsp.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/teststops.dsp.
The file will have its original line endings in your working directory.
Please commit or stash them.
No rebase in progress?
error: Your local changes to the following files would be overwritten by merge:
vendor/rtaudio/tests/Windows/audioprobe.dsp
vendor/rtaudio/tests/Windows/duplex.dsp
vendor/rtaudio/tests/Windows/playraw.dsp
vendor/rtaudio/tests/Windows/playsaw.dsp
vendor/rtaudio/tests/Windows/record.dsp
vendor/rtaudio/tests/Windows/rtaudio.dsw
vendor/rtaudio/tests/Windows/testall.dsp
vendor/rtaudio/tests/Windows/teststops.dsp
Please, commit your changes or stash them before you can merge.
Aborting
warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/audioprobe.dsp. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/duplex.dsp. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/playraw.dsp. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/playsaw.dsp. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/record.dsp. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/rtaudio.dsw. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/testall.dsp. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in vendor/rtaudio/tests/Windows/teststops.dsp. The file will have its original line endings in your working directory. Please commit or stash them. No rebase in progress? error: Your local changes to the following files would be overwritten by merge: vendor/rtaudio/tests/Windows/audioprobe.dsp vendor/rtaudio/tests/Windows/duplex.dsp vendor/rtaudio/tests/Windows/playraw.dsp vendor/rtaudio/tests/Windows/playsaw.dsp vendor/rtaudio/tests/Windows/record.dsp vendor/rtaudio/tests/Windows/rtaudio.dsw vendor/rtaudio/tests/Windows/testall.dsp vendor/rtaudio/tests/Windows/teststops.dsp Please, commit your changes or stash them before you can merge. Aborting