update

.gitattributes

@@ -1,2 +1 @@
-./config/*
-./config/config.prod.js
+config/** merge=ours

README.md

@@ -1,33 +1,9 @@
-# server
+# 分支管理
 
+## 删除本地分支
 
+`git branch -D ${branch_name}`
 
-## QuickStart
+## 删除远程分支
 
-<!-- add docs here for user -->
-
-see [egg docs][egg] for more detail.
-
-### Development
-
-```bash
-$ npm i
-$ npm run dev
-$ open http://localhost:7001/
-```
-
-### Deploy
-
-```bash
-$ npm start
-$ npm stop
-```
-
-### npm scripts
-
-- Use `npm run lint` to check code style.
-- Use `npm test` to run unit test.
-- Use `npm run autod` to auto detect dependencies upgrade, see [autod](https://www.npmjs.com/package/autod) for more detail.
-
-
-[egg]: https://eggjs.org
+`git push self -d ${branch_name}`