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

>>阅读原文<<