诊断
feat:增加CANoe升级脚本 feat:替换解锁文件 feat:修改27服务子功能 feat:增加Boot_Release文件夹、增加BOOT文件、变更记录、升级方式与合成方式说明 feat:删除多余芯片Device feat:修改Option Byte存储地址 feat:增加诊断工具 feat:修改28服务支持03子功能 feat:修改项目校验信息,修改零件号长度 feat:修改文件起始地址
feat:增加CANoe升级脚本 feat:替换解锁文件 feat:修改27服务子功能 feat:增加Boot_Release文件夹、增加BOOT文件、变更记录、升级方式与合成方式说明 feat:删除多余芯片Device feat:修改Option Byte存储地址 feat:增加诊断工具 feat:修改28服务支持03子功能 feat:修改项目校验信息,修改零件号长度 feat:修改文件起始地址
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b ZMY origin/ZMY
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout origin/dev git merge --no-ff ZMY
Step 4. Push the result of the merge to GitLab
git push origin dev
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
This will create a new commit in order to revert the existing changes.