Git rebase失败，'；您对以下文件的本地更改将被merge'；覆盖；。没有本地变化？

这是我试图将我的错误修复分支合并到我的主分支以准备将其推向上游的记录。自从bugfix分支创建以来，已经有一些上游更改被拉入master，现在它拒绝重新设置基址

打开时，它抛出错误的文件没有区别。未添加、删除或重命名任何文件。没有任何内容被忽略，也没有任何内容未跟踪、分段或未分段。我完全搞不懂为什么再基础会失败

我使用的是OSX10.6.6和Git1.7.4

.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git rebase bug586-test master-test
First, rewinding head to replay your work on top of it...
Applying: - comiitting code related to api permissions
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
    inc/data.inc
    templates/apipermissions_tpl.inc
    templates/currencies_tpl.inc
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 - comiitting code related to api permissions

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".



.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git status
# Not currently on any branch.
nothing to commit (working directory clean)



.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git rebase --abort
HEAD is now at 5efccf1 - comiitting code related to api permissions



.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git log -n10 --oneline
5efccf1 - comiitting code related to api permissions
a8a5ee4 Style changes for IE
cfca618 Style changes for IE
8a69de6 Style changes for IE
8946585 - comiitting code related to api permissions - fixed an html error in the currencies template
5fba0a9 Merges the 1.11b branch bugfixes and changes into trunk
ef57049 Andrew Commiting on Blakes behalf on changes he made to transfers; Also an Indue GW balance fix; debitcarupload fix for LSN
69e4313 Fixed an issue with Support From email
9058fb6 Sets the svn property svn:eol-style to LF, to enforce unix style line endings
240839e Fixes up a lot of the whitespace issues.



.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git checkout bug586-test 
Switched to branch 'bug586-test'



.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git log -n10 --oneline  
b7b1f8a Resolves #586, Postback on deposit
5fba0a9 Merges the 1.11b branch bugfixes and changes into trunk
ef57049 Andrew Commiting on Blakes behalf on changes he made to transfers; Also an Indue GW balance fix; debitcarupload fix for LSN
69e4313 Fixed an issue with Support From email
9058fb6 Sets the svn property svn:eol-style to LF, to enforce unix style line endings
240839e Fixes up a lot of the whitespace issues.
cf27b6f - bug that came up with transferring. The transfer page had a hidden field called to, which was taking precedence over cards and usercard which would throw the system out a bit
7c21a81 Fixes #603, new add transaction form, journalled.
01e6292 Removes a pile of resource forks
880c5bc - bug that came up with transferring. The transfer page had a hidden field called to, which was taking precedence over cards and usercard which would throw the system out a bit



.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git rebase master-test bug586-test
First, rewinding head to replay your work on top of it...
Applying: Resolves #586, Postback on deposit
Using index info to reconstruct a base tree...
<stdin>:52: trailing whitespace.
                'name' => 'Invoice Transfer Out', 
<stdin>:175: trailing whitespace.

warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
    templates/deposit_tpl.inc
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Resolves #586, Postback on deposit

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".



.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git rebase --abort
HEAD is now at b7b1f8a Resolves #586, Postback on deposit

-（/Volumes/joshua/www/txfunds）-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`-->git rebase bug586测试主测试
首先，倒带头部，在其上重放您的工作。。。
正在应用：-正在匹配与api权限相关的代码
正在使用索引信息重建基树。。。
退回到修补基础和3路合并。。。
错误：您对以下文件的本地更改将被“合并”覆盖：
公司/数据公司
模板/APIU tpl.inc
模板/货币\u tpl.inc
请在合并之前提交或隐藏更改。
流产
未能在更改中合并。
修补程序在0001处失败-正在匹配与api权限相关的代码
解决此问题后，运行“git-rebase--continue”。
如果您希望跳过此修补程序，请运行“git-rebase--skip”。
要恢复原始分支并停止重定基址，请运行“git-rebase--abort”。
.-（/Volumes/joshua/www/txfunds）-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`-->git状态
#目前不在任何分支上。
没有要提交的内容（工作目录清理）
.-（/Volumes/joshua/www/txfunds）-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`-->git rebase—中止
HEAD现在位于5efccf1-正在匹配与api权限相关的代码
.-（/Volumes/joshua/www/txfunds）-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`-->git日志-n10——一行
5efccf1-与api权限相关的匹配代码
a8a5ee4 IE的风格变化
cfca618 IE的风格变化
8a69de6 IE的样式更改
8946585-与api权限相关的匹配代码-修复了货币模板中的html错误
5fba0a9将1.11b分支错误修复和更改合并到主干中
ef57049 Andrew代表Blakes对其转让所做的变更作出承诺；也是一个Indue GW平衡装置；LSN的debitcarupload修复程序
69e4313通过电子邮件支持修复了一个问题
9058fb6将svn属性svn:eol style设置为LF，以强制使用unix样式的行结尾
240839e解决了许多空白问题。
.-（/Volumes/joshua/www/txfunds）-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`-->git校验bug586测试
切换到分支“bug586测试”
.-（/Volumes/joshua/www/txfunds）-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`-->git日志-n10——一行
b7b1f8a决议#586，押金回发
5fba0a9将1.11b分支错误修复和更改合并到主干中
ef57049 Andrew代表Blakes对其转让所做的变更作出承诺；也是一个Indue GW平衡装置；LSN的debitcarupload修复程序
69e4313通过电子邮件支持修复了一个问题
9058fb6将svn属性svn:eol style设置为LF，以强制使用unix样式的行结尾
240839e解决了许多空白问题。
cf27b6f-传输时出现的错误。传输页面有一个名为to的隐藏字段，它优先于cards和usercard，这会使系统有点失控
7c21a81修复#603，新添加交易表单，日志记录。
01e6292删除一堆资源叉
880c5bc-传输时出现的错误。传输页面有一个名为to的隐藏字段，它优先于cards和usercard，这会使系统有点失控
.-（/Volumes/joshua/www/txfunds）-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`-->git rebase主测试bug586测试
首先，倒带头部，在其上重放您的工作。。。
申请：决议#586，押金回邮
正在使用索引信息重建基树。。。
：52:尾随空格。
“名称”=>“发票转出”，
：175:尾随空格。
警告：2行添加空白错误。
退回到修补基础和3路合并。。。
错误：您对以下文件的本地更改将被“合并”覆盖：
模板/存款公司
请在合并之前提交或隐藏更改。
流产
未能在更改中合并。
修补程序在0001解析#586时失败，在寄存时回发
解决此问题后，运行“git-rebase--continue”。
如果您希望跳过此修补程序，请运行“git-rebase”
git config --global core.trustctime false