Build fails

[malintha]

I'm trying to do a fresh build and it fails with the following message:

Errors << px4:make /home/malintha/drone_demo/logs/px4/build.make.001.log
warning: CRLF will be replaced by LF in src/modules/local_position_estimator/sensors/Flow+Noise+Modelling.pdf.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in src/modules/micrortps_bridge/res/basic_example_flow.png.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in src/modules/local_position_estimator/sensors/Flow+Noise+Modelling.pdf.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in src/modules/micrortps_bridge/res/basic_example_flow.png.
The file will have its original line endings in your working directory.
Cannot rebase: You have unstaged changes.
Please commit or stash them.
No rebase in progress?
error: Your local changes to the following files would be overwritten by merge:
        src/modules/local_position_estimator/sensors/Flow+Noise+Modelling.pdf
        src/modules/micrortps_bridge/res/basic_example_flow.png
Please, commit your changes or stash them before you can merge.
Aborting
Index was not unstashed.
CMake Error at /home/malintha/drone_demo/build/px4/firmware-prefix/tmp/firmware-gitupdate.cmake:105 (message):


Failed to rebase in:
'/home/malintha/drone_demo/build/px4/firmware-prefix/src/firmware/'.

You will have to resolve the conflicts manually


make[2]: *** [firmware-prefix/src/firmware-stamp/firmware-update] Error 1
make[1]: *** [CMakeFiles/firmware.dir/all] Error 2
make: *** [all] Error 2

[julianoes]

It looks like you have local changes.

Check git status and after checking you're not going to lose any data or changes you can consider make clean, make distclean, make submodulesclean.

[hamishwillee]

@julianoes If you are talking about this ....

error: Your local changes to the following files would be overwritten by merge:
        src/modules/local_position_estimator/sensors/Flow+Noise+Modelling.pdf
        src/modules/micrortps_bridge/res/basic_example_flow.png

Something weird going on with github. Those two files are appearing on completely fresh installations of Ubuntu when doing a clone of PX4/Firmware. So you clone, then you see in your workspace two unmerged files with those names.

[julianoes]

Hm, that's odd. I remember having seen that too some days ago actually but not today.

[dagar]

I think it's from the introduction of the .gitattributes file. https://github.com/PX4/Firmware/blob/master/.gitattributes

I'll review.

[dagar]

Should be fixed by #12829.