git 在idea中的操作

参考：https://www.cnblogs.com/pxblog/p/12246248.html

 

说明的是，前期本地回滚提交，可以直接用

 

 ，更方便，然后“ git push -u origin master -f “这个代码是表示冲突的时候强制提交，一般不建议

 

 

 

2.出现git 合并提示 warning: refname 'x' is ambiguous.

stackoverflow.com例子：

git merge BranchyBranch_r2.1 warning: refname 'BranchyBranch_r2.1' is ambiguous.

There actually is both a tag and a branch of the same name (BranchyBranch_r2.1), and on top of that, someone tried to alleviate the problem by aliasing the tag that duplicated the branch.

git show-ref --heads --tags ac729d902578378557f9f20dbd415c5748a23230 refs/heads/BranchyBranch_r2.1 9f3d242e03837fd33f8355005e9edbee89367bef refs/heads/develop 5995987876e6a2315544bd774b546ed561f78a53 refs/heads/master df26c94be018268e2897807c0750b5c66150750b refs/tags/BranchyBranch_r2.1 df26c94be018268e2897807c0750b5c66150750b refs/tags/BranchyBranch_r2.1Tag

If you refer to the branch by its fully qualified name, then you can proceed.

git merge refs/heads/BranchyBranch_r2.1