Skip to content

Instantly share code, notes, and snippets.

@lichenbuliren
Created September 14, 2021 02:07
Show Gist options
  • Save lichenbuliren/ce05490c53e529eb7067e1ccae3a61da to your computer and use it in GitHub Desktop.
Save lichenbuliren/ce05490c53e529eb7067e1ccae3a61da to your computer and use it in GitHub Desktop.
resolve submodule conflict
# 解决子模块冲突问题
git submodule foreach git reset --hard HEAD
git submodule update
git submodule foreach "git checkout master; git pull"
git submodule foreach git clean -f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment