git 解決遠程dev和release衝突

git log    記錄下dev上的提交記錄   git checkout -b release upstream/release  創建並拉去遠程release的代碼   創建並拉去失敗，本地有代碼就先壓棧，然後再git checkout -b release upstream/release 然後再git checkout -b release upstream/release git pu

>>阅读原文<<