CMCC version

[gmicaletto]

CMCC version, version completely different from the original, not only in the file format (fortran90), but also in the directory structure

[georgu]

impossible to do a merge of this version. Too many conflicts. We have to think how to do this merge in Trieste. In the meanwhile I would like to create a branch in this repository that only contains your branch. Then we can work our way through. But I do not know how to do this.
Can somebody help?

[CeliaLaurent]

@georgu , you could create a branch calling it per example "merging" , starting it from the "develop" branch, and then the CMCC can do the pull request towards this "merging" branch so that we can start working without impacting the "develop" branch.

[georgu]

ok, this is a good idea. I create a new branch cmcc from the actual develop branch. But then, trying to merge, who will take care of the 300 conflicts that will come up? Georg

…

On Wed, Sep 20, 2023 at 3:43 PM CeliaLaurent ***@***.***> wrote: @georgu <https://github.com/georgu> , you could create a branch calling it per example "merging" , starting it from the "develop" branch, and then the CMCC can do the pull request towards this "merging" branch so that we can start working without impacting the "develop" branch. — Reply to this email directly, view it on GitHub <#55 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADMTZOKKUBFJIK3CWTU4ZILX3LXIBANCNFSM6AAAAAA44W4X7E> . You are receiving this because you were mentioned.Message ID: ***@***.***>

-- --------------------------------------- Georg Umgiesser Oceanography, ISMAR-CNR Arsenale Tesa 104, Castello 2737/F 30122 Venezia, Italia e-mail : ***@***.*** web : http://www.ismar.cnr.it/ skype : georg.umgiesser tel : +39 - 041 - 2407 943 fax : +39 - 041 - 2407 940 ---------------------------------------

[georgu]

I think the best thing would be to create a new repository, and call it shyfem-cm. Then I would commit our develop branch there, and CMCC will do the same. Not only me, but also you (for OGS) and somebody from CMCC should have the right to commit. In this way everybody can resolve the conflicts autonomously. Can you do this, Celia? Georg

…

On Wed, Sep 20, 2023 at 3:43 PM CeliaLaurent ***@***.***> wrote: @georgu <https://github.com/georgu> , you could create a branch calling it per example "merging" , starting it from the "develop" branch, and then the CMCC can do the pull request towards this "merging" branch so that we can start working without impacting the "develop" branch. — Reply to this email directly, view it on GitHub <#55 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADMTZOKKUBFJIK3CWTU4ZILX3LXIBANCNFSM6AAAAAA44W4X7E> . You are receiving this because you were mentioned.Message ID: ***@***.***>

-- --------------------------------------- Georg Umgiesser Oceanography, ISMAR-CNR Arsenale Tesa 104, Castello 2737/F 30122 Venezia, Italia e-mail : ***@***.*** web : http://www.ismar.cnr.it/ skype : georg.umgiesser tel : +39 - 041 - 2407 943 fax : +39 - 041 - 2407 940 ---------------------------------------