git checkout OpenHarmony-6.0-Release
git pull https://gitee.com/bibofly/edm_codeConfilictsMR.git OpenHarmony-6.0-Release
git push origin OpenHarmony-6.0-Release