从 dev 合并到 master 冲突后，直接放弃 master 的冲突，将 master 指向 dev 怎么操作？

This topic created in 4229 days ago, the information mentioned may be changed or developed.

2 replies

otakustay

Jan 12, 2015 via iPhone

git co develop
git br -D master
git co -b master

慎用

babyname

Jan 12, 2015

@otakustay 删除后重建，好办法。。。