我只是做了一些更改,然后提交,但是当我尝试推送时,我收到一个错误,表明一切都是最新的。
为什么会发生这种情况?作为说明,昨天我遇到了一些合并问题,今天我不得不做一个 git checkout some_version_number
知道这里出了什么问题吗?谢谢!
这是 git status 的输出
macoss-MacBook-Pro-10:Marketing owner12$ git status
# Not currently on any branch.
# 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: Marketing/en.lproj/MainStoryboard_iPad.storyboard
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# Marketing.xcodeproj/project.xcworkspace/xcuserdata/owner12.xcuserdatad/
然后当我尝试通过执行 git checkout master 去我的分支时,我得到了这个:
macoss-MacBook-Pro-10:Marketing owner12$ git push origin master
Password for 'https://genadinik@bitbucket.org':
Everything up-to-date
macoss-MacBook-Pro-10:Marketing owner12$ git checkout master
error: Your local changes to the following files would be overwritten by checkout:
Marketing/en.lproj/MainStoryboard_iPhone.storyboard
Please, commit your changes or stash them before you can switch branches.
error: The following untracked working tree files would be overwritten by checkout:
Marketing.xcodeproj/project.xcworkspace/xcuserdata/owner12.xcuserdatad/UserInterfaceState.xcuserstate
Please move or remove them before you can switch branches.