diff --git a/categories/devops.md b/categories/devops.md index 9a4035c..bd090a4 100644 --- a/categories/devops.md +++ b/categories/devops.md @@ -80,8 +80,9 @@ terraform apply # Apply changes to cluster ## OSI Model( 7 layers network) ![OSI Models](https://raw.githubusercontent.com/wahyd4/knowledge-mind-mapping/master/assets/images/osi-model.png) + # tools -- git +## git - cherrypick - rebase - commit @@ -106,7 +107,11 @@ terraform apply # Apply changes to cluster - mv Rename/move files and folder with git history records e.g. git mv -k ./a/b ./c/d option `k` would avoid the "can not move directory into itself" error. -- oh-my-zsh -- IDE/tools +## oh-my-zsh +## IDE/tools - Intellij - vscode + +## Security + +# diff --git a/categories/team-work.md b/categories/team-work.md index cacb07d..af2de95 100644 --- a/categories/team-work.md +++ b/categories/team-work.md @@ -34,7 +34,7 @@ ### Among teams/Company -* Regular whole office standup, one people stands for each team. +* Regular whole office stand up, one people stands for each team. * Regular office update, Q&A * Regular office tech people meeting. @@ -46,6 +46,7 @@ - ThoughtWorks Tech Radar - CI - CD +- Gantt chart - monitoring/debuging - NewRelic - Sentry