到项目目录下打开git命令行
使用 git branch -a 命令可以查看所有本地分支和远程分支(git branch -r 可以只查看远程分支)
就可以看到所分支 重启idea就有了
之前是idea重启但是就是看不到最新的分支
Git-查看远程分支、本地分支、创建分支
https://www.cnblogs.com/yongdaimi/p/7600052.html?tdsourcetag=s_pctim_aiomsg
git合并分支代码冲突解决操作流程
https://blog.csdn.net/u011411602/article/details/80596361?tdsourcetag=s_pctim_aiomsg
Git 冲突:Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
https://blog.csdn.net/nan7_/article/details/25624637?tdsourcetag=s_pctim_aiomsg
git diff 文件对比
1. git diff filepath 工作区与暂存区比较
2. git diff HEAD filepath 工作区与HEAD ( 当前工作分支) 比较
3. git diff --staged 或 --cached filepath 暂存区与HEAD比较
4. git diff branchName filepath 当前分支的文件与branchName 分支的文件进行比较
5. git diff commitId filepath 与某一次提交进行比较
IDEA中文乱码及解决方法
https://blog.csdn.net/qq_41806338/article/details/84196851?tdsourcetag=s_pctim_aiomsg