git checkout OLK-6.6
git pull https://gitee.com/ni-cunshu/kernel.git resolve_conflict_refactor
git push origin OLK-6.6