search

ESCOMP / POP2-CESM

Parallel Ocean Program (POP2) in CESM
http://www.cesm.ucar.edu/models/cesm2/ocean/
4 stars 24 forks source link

Rebase cesm2_1_x_rel changes onto master #7

Closed alperaltuntas closed 4 years ago

alperaltuntas commented 5 years ago

Description of changes:

Rebase cesm2_1_x_rel changes onto master, so as to synch both branches. Git commands that were executed to accomplish rebase:

git checkout cesm2_1_x_rel
git checkout -b sync_with_rel2.1
git reset --hard 2a49780dd02cf84f395ca6820168acd58005f0a2
git rebase --onto master ddc4347016f7fcfabe3c41d836c2b54457d42d02
git rm BranchChangeLog
git commit -m "resolve conflict while rebasing rel2.1 onto master"
git rebase --skip
alperaltuntas commented 4 years ago

@mnlevy1981 this should now be ready for merge.