BayesianTools icon indicating copy to clipboard operation
BayesianTools copied to clipboard

Check open branches

Open florianhartig opened this issue 7 years ago • 7 comments
trafficstars

Hi Tankred / max ... we still have 3 open branches flying around that branched off from development. I think I'll nevertheless merge dev now in master, but can you check what's up with these branches, possibly update them from master, and then merge / close / delete them, whatever is appropriate?

florianhartig avatar Jun 08 '18 10:06 florianhartig

From my side, those branches can be deleted, what about you @MaximilianPi ?

TankredO avatar Jul 17 '18 11:07 TankredO

So the pre-optimization stuff is off the table for now? How far did you get with it? Otherwise its okay from my side.

MaximilianPi avatar Jul 17 '18 11:07 MaximilianPi

I think we have to check if any of the code in the stale branches in https://github.com/florianhartig/BayesianTools/branches is still useable ... as far as I can see, the issues related to those have not fully been resolved

@JohannesOberpriller - this is maybe something you could have a look at to get started with BT? If you do so, please create a new branch from the current master, and merge the old branches in this new branch (so that we don't break anything in the master). Because these old branches are so far behind, you should make a really careful review of the code. In doubt, speak with me, or we just ditch them and start new.

florianhartig avatar Jan 20 '19 19:01 florianhartig

@MaximilianPi has already merged the #142 branch into master. Branch will be deleted.

JohannesOberpriller avatar Jan 22 '19 11:01 JohannesOberpriller

so, why is it then 1 ahead of master?

florianhartig avatar Jan 22 '19 11:01 florianhartig

https://github.com/florianhartig/BayesianTools/compare/%23142 Just some cosmetics.

JohannesOberpriller avatar Jan 22 '19 11:01 JohannesOberpriller

ok, this was probably accidentally committed to this branch after the merge (branch should have been deleted). It's not really crucial, and we could change it by hand, but just as an exercise, why not merge this into https://github.com/florianhartig/BayesianTools/tree/0.1.6.1-ConsolidateStaleBranches ?

Make sure you update the 142 branch before the merge

florianhartig avatar Jan 22 '19 11:01 florianhartig