search

JCSDA-internal / ufo-data

Tier-1 test files for ufo repository
1 stars 0 forks source link

Feature/sprint ioda converters update with develop 20230106 #286

Closed BenjaminRuston closed 1 year ago

BenjaminRuston commented 1 year ago

Description

update ufo-data sprint branch with develop

BenjaminRuston commented 1 year ago

this is pointless we need an administrator, such as @climbfuji or @ytremolet to resolve when we use git checkout --ours for files

please contact @srherbener to describe this problem, which is rather than producing a conflict we want to tell merging mechanism to take sprint branch for these files which can't be done by a merge into sprint branch

climbfuji commented 1 year ago

I don't see what the problem is: https://github.com/JCSDA-internal/ufo-data/pull/287