search

modelica-3rdparty / netCDF-DataReader

Modelica library for interfacing netCDF files using different interpolation and extrapolation methods
http://www.j-raedler.de/projects/ncdatareader2
GNU Lesser General Public License v2.1
8 stars 6 forks source link

conflicts #8

Closed thorade closed 7 years ago

thorade commented 7 years ago

The .travis.yml file contains some strange characters (lines 28-56) and I cannot pull the latest master anymore.

tbeu commented 7 years ago

This was work in progress to get the 32-bit libraries built on Travis CI (after drone.io deceased its service). After 17 hours of trying I gave up - with some corrupt state obviously. :disappointed:

thorade commented 7 years ago

Thanks for the effort, I'll discuss here whether we can help with compiling on travis. Independent of whether travis works or not, I get some strange merge conflicts, should I try to solve these and send a PR?

tbeu commented 7 years ago

No, it rather would help if I get Travis CI building the 32-bit libs.

thorade commented 7 years ago

My first problem was solved by resetting the master locally to the last working state git reset --hard 88023f4c9022bd32913d164045b25522eab2d645

tbeu commented 7 years ago

Sorry, I used git push --force master pretty much the last weeks. Should have used a separate branch now that you are integrating the package.

tbeu commented 7 years ago

What was your second problem then?

thorade commented 7 years ago

No second problem, closing this issue.

tbeu commented 7 years ago

Good news, Travis CI finally builds successfully.

thorade commented 7 years ago

Thanks again for all the effort. https://travis-ci.org/tbeu/netCDF-DataReader/builds