小编awm*_*awm的帖子

我正试图改变'dev'以赶上'master'分支.

$ git checkout dev 
$ git rebase master 
First, rewinding head to replay your work on top of it...
Applying: Corrected compilation problems that came from conversion from SVN.
Using index info to reconstruct a base tree...
M       src/com/....
<stdin>:125: trailing whitespace.
/**
<stdin>:126: trailing whitespace.
 *
<stdin>:127: trailing whitespace.
 */
<stdin>:128: trailing whitespace.
package com....
<stdin>:129: trailing whitespace.

warning: squelched 117 whitespace errors
warning: 122 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging …

我需要重新组装一个100个部分的zip文件并提取内容.我尝试在输入流中简单地将zip卷连接在一起,但这不起作用.任何建议,将不胜感激.

谢谢.