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
20 stars 8 forks source link

Dev to master #185

Closed HolgerPollyNet closed 1 year ago

HolgerPollyNet commented 1 year ago

Dev is already running on the server successful. Is it the time now for a merging into master?

ZPYin commented 1 year ago

Normally, we can think about merging to master branch when we want to release a big update (bundled with several new features) or fix urgent bugs. This is also true for Dev branch. Otherwise, it's good to stay as it is. I guess no one would like to see git logs with messy information, and often see conflicts when trying to pull remote branches...

But the scale of our dev team (so far) is still small and it's also easy to communicate. Let's just keep the 'rules' simple and flexible... 🍻

ulysses78 commented 1 year ago

I agree with you to keep the rules as they are. BUT please please do not make any new commits to the master branch itself. Just let the master branch exist by pulling from the dev branch only. So we can avoid ugly merging conflicts when merging from dev to master.