Git发现变化，然后说所有内容都是最新的

使用Windows 8，BitNami Rubystack，Ruby 2.0.0p353，Rails 4.0.3。我经常使用Git分支并执行更改。我正在研究一个名为device-enhanced（我相信我是反正......）的分支。我像往常一样去做改变。 Git添加和提交工作，然后结帐说主人是最新的。变回分支机构，它也是最新的？据统计，我改变了12个文件137个变更和133个删除。最新情况如何？我做错了什么？谢谢...Git发现变化，然后说所有内容都是最新的

D:\BitNami\rubystack-2.0.0-11\projects\anyapplication>git add . 
warning: LF will be replaced by CRLF in Gemfile.lock. 
warning: LF will be replaced by CRLF in app/views/layouts/_messages.html.erb. 
warning: LF will be replaced by CRLF in app/views/layouts/application.html.erb. 
warning: LF will be replaced by CRLF in app/views/users/edit.html.erb. 
warning: LF will be replaced by CRLF in app/views/users/show.html.erb. 

D:\BitNami\rubystack-2.0.0-11\projects\anyapplication>git commit -m "Device enhanced but model not yet renamed" 
[eliminate-rolify warning: LF will be replaced by CRLF in Gemfile.lock. 
warning: LF will be replaced by CRLF in app/views/layouts/_messages.html.erb. 
warning: LF will be replaced by CRLF in app/views/layouts/application.html.erb. 
warning: LF will be replaced by CRLF in app/views/users/show.html.erb. 
warning: LF will be replaced by CRLF in app/views/users/edit.html.erb. 
926a210] Device enhanced but model not yet renamed 
warning: LF will be replaced by CRLF in Gemfile.lock. 
warning: LF will be replaced by CRLF in app/views/layouts/_messages.html.erb. 
warning: LF will be replaced by CRLF in app/views/layouts/application.html.erb. 
warning: LF will be replaced by CRLF in app/views/users/edit.html.erb. 
warning: LF will be replaced by CRLF in app/views/users/show.html.erb. 
12 files changed, 137 insertions(+), 133 deletions(-) 
rewrite app/views/layouts/_messages.html.erb (83%) 
create mode 100644 app/views/layouts/_shim.html.erb 
create mode 100644 app/views/users/edit.html.erb 
rewrite db/seeds.rb (81%) 

D:\BitNami\rubystack-2.0.0-11\projects\anyapplication>git checkout master 
Switched to branch 'master' 
Your branch is up-to-date with 'origin/master'. 

D:\BitNami\rubystack-2.0.0-11\projects\anyapplication>git merge device-enhanced 
Already up-to-date. 

D:\BitNami\rubystack-2.0.0-11\projects\anyapplication>git push -u origin master 
Branch master set up to track remote branch master from origin. 
Everything up-to-date 

D:\BitNami\rubystack-2.0.0-11\projects\anyapplication>git status 
On branch master 
Your branch is up-to-date with 'origin/master'. 

nothing to commit, working directory clean

来源

2014-03-28 Richard_G

也许你对主人承诺。 – jcm

我知道这是可能的。即便如此，推送解决方案不会更新吗？ –

事实证明，我合并在一个旧的分支。这减少了我对正确分支所做的所有更改。为了获得这些更改，我从当前备份中恢复了应用程序。在恢复的文件上发出git状态显示了正确的分支。

来源

2014-03-29 00:37:44

我不知道，但似乎你需要做一个git push origin device-enhanced做git checkout master之前。其他的事情是，git checkout master做完之后git pull之前merge它与你的branch。请记住，有时git失去了自己，你可以删除你的folder并做一个新的git clone "git_path"作为唯一可能的解决方案。

来源

2014-03-28 03:32:20 Zini

Git发现变化，然后说所有内容都是最新的

回答

相关问题