执行
git stash pop
时出错：
licrifandeMacBook-Pro:SalesAppiOS crifan$ git pull Already up-to-date. licrifandeMacBook-Pro:SalesAppiOS crifan$ git stash pop fatal: Unable to create ‘/Users/crifan/dev/dev_root/daryun/Projects/Qoros/QorosSales/Sourcecode/SalesAppiOS/.git/index.lock’: File exists. If no other git process is currently running, this probably means a git process crashed in this repository earlier. Make sure no other git process is running and remove the file manually to continue. Cannot apply a stash in the middle of a merge |
不过后来再执行，就可以了：
licrifandeMacBook-Pro:SalesAppiOS crifan$ git stash pop On branch master Your branch is up-to-date with ‘origin/master’. Changes to be committed: (use “git reset HEAD <file>…” to unstage) new file: SalesApp/AttachmentTableViewCellDemo.swift new file: SalesApp/LeftLabelRightLabelTableViewCellDemo.swift new file: SalesApp/LeftLabelRightRadioButtonTableViewCellDemo.swift new file: SalesApp/LeftLabelRightSegmentedControlTableViewCellDemo.swift new file: SalesApp/LeftLabelRightSelectableTableViewCellDemo.swift new file: SalesApp/LeftLabelRightTextviewTableViewCellDemo.swift new file: SalesApp/TextviewTableViewCellDemo.swift 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: SalesApp.xcodeproj/project.pbxproj modified: SalesApp/CustomerDetailViewController.swift Dropped refs/stash@{0} (3cf03f076d1e3441180cbd12f61bfed546a1d51b) |
－》估计是git系统正在内部操作什么，所以暂时没发操作
稍微片刻，再去操作就可以了
转载请注明：在路上 » ［已解决］git stash pop出错：fatal Unable to create .git/index.lock File exists