一.完整步骤
0.git checkout online (切换到commit历史版本 git checkout c9be7238c6fa )
1.git checkout -b feature/WE-Cars
2.新增文件夹，新建项目模块
3.新增文件，修改文件...
4.git add .
5.git commit -m'new pro'
6.git push origin feature/WE-Cars
7.到gitlab上合并到develop 发现问题
问题：其他模块的代码出现了冲突，并不是本项目模块
8.git checkout develop
9.解决冲突
10.git add .
11.git commit -m'resolve'
12.git push origin develop
13.git pull origin develop
14.git checkout feature/WE-Cars
15.git add .
16.git commit -m'something'
17.git push origin feature/WE-Cars
二.其他
cat .git/HEAD 查看head指向
转载于:https://www.cnblogs.com/fancyLee/p/8341148.html
