diff --git a/Readme.md b/Readme.md index 846e9a0..54c3731 100644 --- a/Readme.md +++ b/Readme.md @@ -18,6 +18,8 @@ Here is a skill legend, if these are not on line items they are on headers of se - [ ] "Time box" - [ ] Continuous Intergraton - [ ] Continuous Delivery +- [ ] SCM +- [ ] VCS # Frameworks and Technologies @@ -25,6 +27,7 @@ Here is a skill legend, if these are not on line items they are on headers of se ## Tools +- [ ] Souce Control :sparkles: - [ ] git :sparkles: - [ ] The command line :star: - [ ] grep, sed, awk, tmux, vim, htop :star: @@ -173,4 +176,16 @@ Here is a skill legend, if these are not on line items they are on headers of se - [ ] Object spread :sparkles: - [ ] Babel :dizzy: - [ ] `let` vs `var` :dizzy: -- [ ] `eslint` :star: \ No newline at end of file +- [ ] `eslint` :star: + +# git + +In english you can describe: + +- [ ] A git commit :dizzy: +- [ ] A git rebase vs merge :dizzy: +- [ ] A git branch :dizzy: +- [ ] Forking :sparkles: +- [ ] Merging :dizzy: +- [ ] Merge conflicts :sparkles: +- [ ] Resolving a merge conflict :star: