记录常用的command、style格式要求、git的操作

2017/09/0911.md

+# task 3
+
+* 
\ No newline at end of file

2017/09/command.md

+* Run Bobcat
+```
+docker-compose up
+npm run fe
+forego start
+tail -f log/webpack.app.log //输出log
+```
+
+* update package 
+```
+yarn --ignore-engines
+bundle install
+```
+
+* updata database
+```
+rake db:setup 
+bundle exec strk_build_pages_data
+bundle exec strk_build_manifests
+bundle exec rake seed_cool:all seed_cool:basic_settings
+```
+
+* 查看进程并杀死进程
+```
+lsof -i tcp:port
+kill PID
+```
\ No newline at end of file

2017/09/format-style.md

+* Selector Delimiters
+
+Add a line break after each selector delimiter. Do not add spaces before or after delimiters.
+
+Correct:
+
+```
+.nav,
+.bar {
+  color: @color__base;
+}
+```
+
+Incorrect:
+
+```
+.nav, .bar {
+  color: @color__base;
+}
+```
+
+* Using Single quote.
+
+```
+.nav {
+  content: 'lorem ipsum';
+}
+```
+
+* Add spaces before and after combinators.
+
+```
+.nav + .bar {
+  color: @bar__color;
+}
+```
+
+* Add a blank line at the end of file.
+* Add a blank line after a selector.
+* Avoid using the !important property if possible. If it is required, add a space before the property and leave a comment.
+* Avoid the id selector.
+* All top-level classnames (common elements and feature wrappers) must have s- prefix
+* Class names should be lowercase, start with a letter (except helper classes), words should be separated with dash ‘-‘.
+* Avoid using more than three levels of nesting.
\ No newline at end of file

2017/09/git操作.md

+* 拆分commit
+* 拆分commit
+1. `git rebase -i origin/develop`
+2. 修改要拆分的分支，将最前面的改为 `edit`
+3. `git reset HEAD^` or `git reset HEAD~{x}`
+4. `git add` and `git add -p`
+5. `git rebase --continue`
+
+    ps: `git add -p` 只对已经存在的文件有效
+
+* 合并commit
+
+    _[请前往0901](https://cd.i.strikingly.com/tulip.li/log/blob/master/2017/09/0901.md)_
+
+* 代码丢失
+
+    _[请前往0905](https://cd.i.strikingly.com/tulip.li/log/blob/master/2017/09/0905.md)_