History conflicts between CICE-Consortium and emc/develop

[NickSzapiro-NOAA]

While comparison of the authoritative CICE-Consortium with EMC fork shows ~O(100) different commits:

• EMC-->CICE-Consortium
• EMC<--CICE-Consortium

code content has not diverged. These "git" differences are largely historical (changing the base branch from ESCOMP to CICE-Consortium, a period with an EMC fork of Icepack, etc.) and complicate merging developments between forks.

Several merging or rebasing strategies could improve consistency between forks. However, any strategy that changes branch history can impact downstream branches, particularly ufs-community/ufs-weather-model tags and their development history. Issuing a new branch from CICE-Consortium/main would synchronize with the authoritative repository and maintain history for dependent tags/branches.

[NickSzapiro-NOAA]

Any commits in the EMC/fork not in Consortium should be pushed first. Namely:

• https://github.com/NOAA-EMC/CICE/pull/77
• https://github.com/NOAA-EMC/CICE/pull/80
• https://github.com/NOAA-EMC/CICE/pull/83