You are viewing an old version of this page. View the current version.

Compare with Current View Page History

Version 1 Next »

O'Grady, Paul Christopher <cpo@slac.stanford.edu>
Mon 7/6/2020 2:49 PM
Hi Mikhail and Valerio,

To make things easier going forward, I propose we "merge as we go" from the master branch to the py3 branch whenever we make changes to psana1. This would entail (only for packages with a ?py3? branch!):

- making sure all changes are py3 compatible. unfortunately we don?t have a good way of doing this at the moment apart from looking at the code (we don?t have a ?test release? mode for the new-style psana1)
- git checkout py3
- git merge master
- git push origin py3

We can discuss after the tag-up if that would be useful.

chris
-------------

and return branch back to master
- git checkout master

  • No labels