当有更新时,我第一次执行git pull
时,总是会收到cannot lock ref 'refs/remotes/origin/master'
的错误提示。
完整的控制台日志如下。
D:\code\react-native\expo-multi-screen-starter>git pull
error: cannot lock ref 'refs/remotes/origin/master': is at b2459b4d5af42622cba55f9fe47ccd14fbd879bc but expected 76f11048c866cfe3e6570eaacf90db3cb7732723
From github.com:liudonghua123/expo-multi-screen-starter
! 76f1104..b2459b4 master -> origin/master (unable to update local ref)
D:\code\react-native\expo-multi-screen-starter>git pull
App.js | 19 ++++-----
src/navigation/AuthStack.js | 14 +++++++
src/navigation/RootNavigator.js | 22 ++++++++++
src/navigation/TabNavigator.js | 4 +-
src/screens/AuthLoadingScreen.js | 35 ++++++++++++++++
src/screens/HomeScreen.js | 19 +++++++++
src/screens/{LoginScreen.js => SignInScreen.js} | 54 ++++++++++++++++++++++---
7 files changed, 147 insertions(+), 20 deletions(-)
create mode 100644 src/navigation/AuthStack.js
create mode 100644 src/navigation/RootNavigator.js
create mode 100644 src/screens/AuthLoadingScreen.js
rename src/screens/{LoginScreen.js => SignInScreen.js} (61%)
D:\code\react-native\expo-multi-screen-starter>