search

PollyNET / Pollynet_Processing_Chain

NRT lidar data processing program for multiwavelength polarization Raman lidar network (PollyNET)
https://polly.tropos.de/
GNU General Public License v3.0
19 stars 8 forks source link

changes related to issue #196 ... implement 1-step Poliphon #221

Closed AthenaAugousta closed 10 months ago

AthenaAugousta commented 10 months ago

Poliphon step-1 is now implemented. Please review!

HolgerPollyNet commented 10 months ago

@AthenaAugousta @ulysses78 Thanks for uploading it looks indeed very promising. However, could you please try to resolve the conflicts first on your own and then upload a new (maybe locally merged version) for a pull request?

Thanks!

HolgerPollyNet commented 10 months ago

In my opinion it would be easiest, if you pull the latest dev. Copy the modification you had to made in PicassoV3 in the pulled version: grafik

and grafik

And the add the new files grafik

and modify the global config as done grafik and test and no conflict should be there anymore.

ulysses78 commented 10 months ago

@AthenaAugousta ... do you know how to pull the newest dev-branch?

AthenaAugousta commented 10 months ago

@AthenaAugousta ... do you know how to pull the newest dev-branch?

git pull dev Athena, right?

ulysses78 commented 10 months ago

no. switch to the dev branch first: git checkout dev Than: git pull origin dev

AthenaAugousta commented 10 months ago

Thank you @ulysses78! Now that I have done the modifications to the dev branch (locally) I should commit the changes and then git push origin dev?

ulysses78 commented 10 months ago

I think it is best not to do the changes on the dev branch, but create a new branch, where you make your changes and afterwards push this new branch to github.

ulysses78 commented 10 months ago

pushing the new branch: git push origin new-branch-name