VisualFC - WTL/WinxGUI可视化开发环境

WinxGui团队成员及VisualFC作者近日发布了WTL/WinxGUI可视化开发环境VisualFC的重要更新。
sunhaoming@ubuntu:~/ipc_platform/platform/nvmp$ git cherry-pick --continue U nvmp/product_config/c340wv2/version.config U nvmp/product_config/c440wv2/version.config U nvmp/product_config/c540-4gv1.2/buildroot.config U nvmp/product_config/c540-4gv1.2/isp_config/C540-4g_1.20/base-files/cfg/day/day_isp.cfg U nvmp/product_config/c540-4gv1.2/isp_config/C540-4g_1.20/base-files/cfg/night/night_isp.cfg U nvmp/product_config/c540-4gv1.2/isp_config/C540-4g_1.20/base-files/cfg/night_wtl/night_wtl_isp.cfg U nvmp/product_config/c540-4gv1.2/isp_config/Default-devName_Default-hwVer/base-files/cfg/day/day_isp.cfg U nvmp/product_config/c540-4gv1.2/isp_config/Default-devName_Default-hwVer/base-files/cfg/night/night_isp.cfg U nvmp/product_config/c540-4gv1.2/isp_config/Default-devName_Default-hwVer/base-files/cfg/night_wtl/night_wtl_isp.cfg U nvmp/product_config/c540wv2/version.config U nvmp/product_config/cx45ziv1/dts/Linux/cfg_560_IPCAM1_NAND_EVB/nvt-peri.dtsi U nvmp/product_config/s345-4G/version.config U nvmp/tp_package/nsd/src/modules/dhcpc/dhcpc.c error: commit is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. sunhaoming@ubuntu:~/ipc_platform/platform/nvmp$ git diff --name-only --diff-filter=U | grep -v "dhcpc.c" | xargs -I {} git checkout --ours -- {} error: pathspec 'nvmp/product_config/c340wv2/version.config' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c440wv2/version.config' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c540-4gv1.2/buildroot.config' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c540-4gv1.2/isp_config/C540-4g_1.20/base-files/cfg/day/day_isp.cfg' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c540-4gv1.2/isp_config/C540-4g_1.20/base-files/cfg/night/night_isp.cfg' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c540-4gv1.2/isp_config/C540-4g_1.20/base-files/cfg/night_wtl/night_wtl_isp.cfg' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c540-4gv1.2/isp_config/Default-devName_Default-hwVer/base-files/cfg/day/day_isp.cfg' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c540-4gv1.2/isp_config/Default-devName_Default-hwVer/base-files/cfg/night/night_isp.cfg' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c540-4gv1.2/isp_config/Default-devName_Default-hwVer/base-files/cfg/night_wtl/night_wtl_isp.cfg' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/c540wv2/version.config' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/cx45ziv1/dts/Linux/cfg_560_IPCAM1_NAND_EVB/nvt-peri.dtsi' did not match any file(s) known to git. error: pathspec 'nvmp/product_config/s345-4G/version.config' did not match any file(s) known to git. 为什么这么多报错,我可以先解决dhcp吗,我想看看去呗
最新发布
12-11
评论
成就一亿技术人!
拼手气红包6.0元
还能输入1000个字符
 
红包 添加红包
表情包 插入表情
 条评论被折叠 查看
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值