search

df8oe / UHSDR

SDR firmware and bootloader with configuration files for use with Eclipse, EmBitz and Makefile
Other
360 stars 189 forks source link

Fix bootloader build issue for Eclipse #1875

Closed db4ple closed 4 years ago

db4ple commented 4 years ago

added missing include path to ALL languages in all bootloader configurations

df8oe commented 4 years ago

I do not understand why this gets merge conflicts... You have chenaged one line and added one line on serveral places. Why can GitHub not detect that? I can solve the conflict by adding the lines manually. But I do not know if this is a good idea or if you can solve the conflict in your pull request...

db4ple commented 4 years ago

There is one detected conflicting change in/around line 1328:

I don't understand it either. That's why I had to submit the CR (to be able to see the conflict).

I will fix this.

db4ple commented 4 years ago

Now the PR has no conflicts anymore.