用新分支：git checkout --theirs 文件用master分支：git checkout --ours 文件 执行之后git add
原创
2022-08-28 07:56:51
134阅读
git merge 从feature分支合并到master分支 $ git checkout master $ git merge feature Auto-merging Document CONFLICT (content): Merge conflict in $codefileAutomat
转载
2020-09-30 14:22:00
343阅读
软件无线电FPGA下载建议说明：
连接好下载线，确保DSP JTAG口旁边的按键为按下状态。给目标版上电：
打开ISE
点击File->Open Project打开工程，选择工程（注意请不要将工程放在中文目录下，最好在磁盘根目录下创建一个新文件夹）
双击此处编译，完成后会显示为绿色对勾，如上图。接着双击config device打开
原创
2012-06-05 13:59:38
546阅读
1. 配置Redhat分辨率
redhat-config-xfree86
2..挂载串口
vmware挂载USB转串口 /dev/ttyUSB0
3.往SMC卡烧写Linux系统时进入BusyBox无法ping通Redhat
首先配置网络连接方式为Bridge
配置Redhat IP
配置windows xp的 IP为同一网段
配置nfs时
vi /etc/ex
原创
2012-06-05 09:24:13
719阅读
点赞
2评论
OURS PXA270RP 三系统启动说明
1. 启动wince5.0：
给实验箱接上电源，将实验箱电源接口旁边的拔码开关拔到“ON”，稍等片刻，wince5.0系统就启动了。
注：由于wince系统烧在了底板上1GB的NAND Flash里面，启动时间稍长，请耐心等待。
2. &
原创
2012-06-05 13:06:39
373阅读
OURS-IOTV2 EP物联网创新套件增强版
每一个扩展板上都有一个EEPROM，存储着相应的ID，便于2530模块进行扩展板类型识别
模块ID 模块名称
0x1000 电压采集模块单通道
0x1001 电压采集模块双通道
0x1010 电流采集模块单通道
0x1011 电流采集模块双通道
0x1018 微电流传感器单通道
原创
2012-06-05 09:48:13
953阅读
270RP-WinCE-5.0-电机模块不能打开设备
请确保有三个文件EmotorApp.exe，EmotorDrv.dll，EmotorDrv.reg
使用记事本打开EmotorDrv.reg可以看到"Dll"="\Nand Flash\EmotorDrv.dll"
意思是这个驱动程序的EmotorDrv.dll文件必须在\Nand Flash\目录
原创
2012-06-18 18:23:35
742阅读
点赞
1评论
OURS-SDR高级软件无线电-信号发生器IP
1. 信号发生器IP： 192.168.1.253 （默认）
 
原创
2012-06-05 13:21:55
761阅读
OURS-IOTV2 物联网综合演示系统无法显示节点
四种原因：
1. 串转网IP配置不对
2. 串转网的跳线帽没有正确使用
3. 电脑上面开着无线网络
4. &n
原创
2012-06-05 12:52:16
1146阅读
的应用程序到北京OURS-PXA270 ，-lcxcore我在交叉编译之前，首先用非交叉编译并运行通过，但是到我再使用交叉编译的时候却无法找到那样的库，但我明明就是有添加进去的。后来在网上搜索，和向网友大牛们提问的时候，他们告诉我这是因为编译器的版本不一致
原创
2010-08-02 17:31:01
503阅读
And as long as they're going to steal it, we want them to steal ours.
转载
精选
2008-10-27 11:32:29
378阅读
Description：On Planet MM-21, after their Olympic games this year, curling is getting popular. But the rules are somewhat different from ours. The game is played on an ice game board on which a squa...
原创
2023-05-09 10:03:23
53阅读
On Planet MM-21, after their Olympic games this year, curling is getting popular. But the rules are somewhat different from ours. The game is played on an ice game board on which a square mesh is mark...
原创
2021-07-09 14:52:38
119阅读
Gensokyo is a world which exists quietly beside ours, separated by a mystical border. It is a utopia where humans and other beings such as fairies, yo
原创
2021-08-05 10:20:10
51阅读
Description On Planet MM-21, after their Olympic games this year, curling is getting popular. But the rules are somewhat different from ours. The game
转载
2018-08-11 11:55:00
62阅读
On Planet MM-21, after their Olympic games this year, curling is getting popular. But the rules are somewhat different from ours. The ...
转载
2017-06-10 22:51:00
23阅读
2评论
apple tv 开发 Apple is integrating Siri into everything and why not? It is a favorite of ours and works well whether it is on the Apple Watch or the iPhone or iPad. If you’re using an Apple T
转载
2024-02-28 17:03:55
84阅读
Shoot the BulletTime Limit:2 Seconds Memory Limit:32768 KB Special JudgeGensokyois a world which exists quietly beside ours, separated by a mystical b...
转载
2016-01-23 19:34:00
38阅读
2评论
Problem DescriptionOn Planet MM-21, after their Olympic games this year, curling is getting popular. But the rules are somewhat different from ours. The game is played on an ice game board on whic
原创
2022-08-10 12:35:36
57阅读
Shoot the BulletTime Limit: 2 Seconds Memory Limit: 32768 KB Special JudgeGensokyo is a world which exists quietly beside ours, separated by a mystical border. It is a utopia where
原创
2023-07-07 13:46:51
43阅读
