git:you need to resolve your current index first

 git reset --merge  // 回退到merge前

发表评论

电子邮件地址不会被公开。

This site uses Akismet to reduce spam. Learn how your comment data is processed.