guhongwei
6620a5c9a5
Merge branch 'dev'
|
1 year ago | |
|---|---|---|
| .github | 2 years ago | |
| app | 1 year ago | |
| config | 1 year ago | |
| test | 2 years ago | |
| .autod.conf.js | 2 years ago | |
| .eslintignore | 2 years ago | |
| .eslintrc | 2 years ago | |
| .gitattributes | 1 year ago | |
| .gitignore | 1 year ago | |
| README.md | 1 year ago | |
| app.js | 2 years ago | |
| ecosystem.config.js | 1 year ago | |
| package-lock.json | 2 years ago | |
| package.json | 2 years ago | |
| server.js | 2 years ago |
README.md
分支管理
删除本地分支
git branch -D ${branch_name}
删除远程分支
git push self -d ${branch_name}
拉取指定分支
git clone -b ${branch_name} ${url}
避免冲突,不进行版本合并
1.git config --global merge.ours.driver true
2.设置.gitattributes
3.master 修改忽略文件,提交; 分支修改忽略文件,提交;分支合并master,提交
dev master 1