我是相当新的Git的同名但不同情况下的文件,我有做底垫中,它似乎显示出文件中的问题......Git的变基带问题
create.sql
和文件
Create.sql
的Create.sql没有上演,而物理上不存在了,但我不能用底垫中继续...当我尝试git的变基--continue我得到以下...
个$ git rebase --continue
KeyBlade/KeyBlade.Database/_Pending/Create.sql: needs update
You must edit all merge conflicts and then
mark them as resolved using git add
Git的状态呈现以下...
/c/src/git ((c3760e6...)|REBASE)
$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: KeyBlade/KeyBlade.Database/_Pending/create.sql
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: KeyBlade/KeyBlade.Database/_Pending/Create.sql
#
我不知道是怎么回事,但如果任何人都可以对我怎么能解决这个闪耀光芒,这将是大加赞赏。
哪个OS和你正在使用的文件系统? – Mark 2011-12-22 13:31:05
我正在使用Windws 7 - NTFS文件系统 – 2011-12-23 04:03:26