- You would currently be working on your feature-branch. Do a git branch to check
- Do a
git statusand commit any of your unstaged changes - Rebase from feature-branch =>
git pull --rebase upstream master - Switch to master branch and rebase =>
git pull --rebase upstream master - Push updated changes up to github origin-master =>
git push origin master - Move Back to feature-branch =>
git checkout feature-branch - That’s it!
David Kang d-kang
d-kang
/ todo_code_review.html
Created
August 23, 2018 02:25
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <html> | |
| <head></head> | |
| <body> | |
| <ul id="todo-app"> | |
| <li class="todo"><span>Walk the dog</span></li> | |
| <li class="todo"><span>Pay bills</span></li> | |
| <li class="todo"><span>Make dinner</span></li> | |
| <li class="todo"><span>Code for one hour</span></li> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| const Tower = function(n) { | |
| this.top = -1; // push will add one to top | |
| this.stack = []; | |
| for (let i = n; i > 0; i--) { | |
| this.stack.push(i); | |
| } | |
| } | |
| // push |
d-kang
/ node_chatbot.js
Last active
October 3, 2017 18:30
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| const { RtmClient, MemoryDataStore, RTM_EVENTS } = require('@slack/client'); | |
| const token = process.env.SLACK_TOKEN || ''; | |
| const rtm = new RtmClient(token, { | |
| logLevel: 'error', | |
| // logLevel: 'debug', | |
| // Initialise a data store for our client, this will load additional helper functions for the storing and retrieval of data | |
| dataStore: new MemoryDataStore(), | |
| // Boolean indicating whether Slack should automatically reconnect after an error response | |
| autoReconnect: true, |
d-kang
/ gitflow2.md
Last active
October 3, 2017 02:19
d-kang
/ gitflow1.md
Last active
January 19, 2020 04:48
- Make sure all changed files are committed on feature-branch
- Rebase on your feature-branch =>
git pull --rebase upstream master - Switch to your master branch =>
git checkout master - Rebase on your master =>
git pull --rebase upstream master - If there are changes then push changes to master =>
git push origin master - Go back to feature-branch =>
git checkout feature-branch - Push changes from feature-branch to github =>
git push origin feature-branch
d-kang
/ David-Kang-Underbar-2-Assessment.js
Created
May 2, 2017 04:06
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| var salesTeam = [{name: {first: 'aleen', last: 'atkins'}, age: 26, sales: '$2314'}, | |
| {name: {first: 'alvaro', last: 'angelos'}, age: 55, sales: '$1668'}, | |
| {name: {first: 'denese', last: 'dossett'}, age: 29, sales: '$9248'}, | |
| {name: {first: 'douglas', last: 'denney'}, age: 53, sales: '$5058'}, | |
| {name: {first: 'earline', last: 'erickson'}, age: 19, sales: '$18876'}, | |
| {name: {first: 'herman', last: 'hazell'}, age: 25, sales: '$2746'}, | |
| {name: {first: 'homer', last: 'hirth'}, age: 26, sales: '$474'}, | |
| {name: {first: 'hwa', last: 'heidt'}, age: 53, sales: '$9607'}, | |
| {name: {first: 'hyon', last: 'hampshire'}, age: 46, sales: '$13598'}, | |
| {name: {first: 'issac', last: 'ingerson'}, age: 45, sales: '$5225'}, |