我正试图改变'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 …我使用FileMerge作为difftoolGit 的工具.最近,我开始收到一个奇怪的错误消息:
Unable to load platform at path /Applications/Xcode.app/Contents/
Developer/Platforms/iPhoneOS.platform
FileMerge仍然可以正常执行diff(尽管加载需要更长的时间).知道是什么导致了这个,以及如何解决它？
git clone blah
git checkout -b development
git checkout -b bug581
hack hack
git checkout -b bug588
hack hack
哦等等,bug 588应该从开发中萌芽,而不是581.
git rebase --onto development bug581 bug588
给我:
Cannot rebase: You have unstaged changes.
Please commit or stash them.
呃,但我不呢？git status显示工作目录是干净的.所以让我们只是为了咯咯笑.
git stash
git rebase --onto development bug581 bug588
好吧现在它有效,但它拉动了581和588的历史,我只想要588的历史,而不是581的历史.