What version of the code are you using?
ctsm5.3.040
Have you made any changes to files in the source tree?
I am merging my module which is in ctsm5.2.005-222-g70e7f0466 with the newest tag
Describe your problem or question:
Hi,
I am trying to merge two versions of CLM, my old version of CLM has too many modifications especially the changes made on the coupler. I am wondering after I solve the code conflicts, should I git commit first or I should checkout_externals first? One more question, I have made several changes to the components/cmeps, if I do checkout_externals, the newly downloaded components will cover my modifications?
best,
ctsm5.3.040
Have you made any changes to files in the source tree?
I am merging my module which is in ctsm5.2.005-222-g70e7f0466 with the newest tag
Describe your problem or question:
Hi,
I am trying to merge two versions of CLM, my old version of CLM has too many modifications especially the changes made on the coupler. I am wondering after I solve the code conflicts, should I git commit first or I should checkout_externals first? One more question, I have made several changes to the components/cmeps, if I do checkout_externals, the newly downloaded components will cover my modifications?
best,