问题:
Entry 'xxxx' not uptodate. Cannot merge.
eg:
Entry '.idea/gradle.xml' not uptodate. Cannot merge.
先进行一步:
git reset --hard HEAD
再进行Pull
问题:
Entry 'xxxx' not uptodate. Cannot merge.
eg:
Entry '.idea/gradle.xml' not uptodate. Cannot merge.
先进行一步:
git reset --hard HEAD
再进行Pull