Skip to content

Instantly share code, notes, and snippets.

@fdjones

fdjones/gist:ebe48b7d7a096a5e4de7cd886e4a5a2f

Created January 28, 2017 18:35
Show Gist options
  • Save fdjones/ebe48b7d7a096a5e4de7cd886e4a5a2f to your computer and use it in GitHub Desktop.
Save fdjones/ebe48b7d7a096a5e4de7cd886e4a5a2f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Freddies-MBP:~ freddiejones$ cd /Users/freddiejones/Documents/Code/Market-Data
Freddies-MBP:Market-Data freddiejones$
Freddies-MBP:Market-Data freddiejones$ git branch
* b-input-misalignment
master
Freddies-MBP:Market-Data freddiejones$ pwd
/Users/freddiejones/Documents/Code/Market-Data
Freddies-MBP:Market-Data freddiejones$ git branch
* b-input-misalignment
master
Freddies-MBP:Market-Data freddiejones$ git status
On branch b-input-misalignment
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: client/actions/stockActions.js
modified: client/actions/userActions.js
modified: client/components/Footer.js
modified: client/components/NavLoggedIn.js
modified: client/components/Portfolio.js
modified: client/components/PortfolioSummary.js
new file: client/components/SettingsForm.js
modified: client/components/Watchlist.js
modified: client/containers/Dashboard.js
modified: client/containers/IndexRedirect.js
modified: client/containers/Settings.js
modified: client/index.html
modified: client/index.js
modified: client/reducers/stock.js
modified: client/reducers/user.js
modified: client/styles/components/Portfolio.css
modified: client/styles/components/PortfolioSummary.css
modified: client/styles/components/PreviousTrades.css
modified: client/styles/components/Watchlist.css
modified: client/styles/containers/Dashboard.css
modified: client/utils/utils.js
modified: routes/stock.js
modified: routes/user.js
modified: schema/schema.sql
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: client/styles/atoms/NumberInput.css
modified: client/styles/components/StockForm.css
modified: client/styles/containers/Root.css
Freddies-MBP:Market-Data freddiejones$ git diff --staged
diff --git a/client/actions/stockActions.js b/client/actions/stockActions.js
diff --git a/client/actions/stockActions.js b/client/actions/stockActions.js
index e382880..5d52a04 100644
--- a/client/actions/stockActions.js
+++ b/client/actions/stockActions.js
@@ -9,6 +9,24 @@ export const isFetching = (bool) => {
return { type: 'FETCHING_STOCK_DATA', payload: bool }
}
}
// I'll save you the hassle of scrolling through the 1000 lines of changes
Freddies-MBP:Market-Data freddiejones$ git branch
* b-input-misalignment
master
Freddies-MBP:Market-Data freddiejones$ git pull upstream development
remote: Counting objects: 43, done.
remote: Compressing objects: 100% (15/15), done.
remote: Total 43 (delta 28), reused 40 (delta 25), pack-reused 0
Unpacking objects: 100% (43/43), done.
From https://github.com/RecursiveLogic/Market-Data
* branch development -> FETCH_HEAD
0667107..3e122cc development -> upstream/development
error: Your local changes to the following files would be overwritten by merge:
client/actions/stockActions.js
client/components/Portfolio.js
client/components/SettingsForm.js
client/components/Watchlist.js
client/containers/Dashboard.js
client/reducers/stock.js
routes/stock.js
Please commit your changes or stash them before you merge.
error: Your local changes to the following files would be overwritten by merge:
client/styles/components/StockForm.css
Please commit your changes or stash them before you merge.
Aborting
Freddies-MBP:Market-Data freddiejones$ git status
On branch b-input-misalignment
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: client/actions/stockActions.js
modified: client/actions/userActions.js
modified: client/components/Footer.js
modified: client/components/NavLoggedIn.js
modified: client/components/Portfolio.js
modified: client/components/PortfolioSummary.js
new file: client/components/SettingsForm.js
modified: client/components/Watchlist.js
modified: client/containers/Dashboard.js
modified: client/containers/IndexRedirect.js
modified: client/containers/Settings.js
modified: client/index.html
modified: client/index.js
modified: client/reducers/stock.js
modified: client/reducers/user.js
modified: client/styles/components/Portfolio.css
modified: client/styles/components/PortfolioSummary.css
modified: client/styles/components/PreviousTrades.css
modified: client/styles/components/Watchlist.css
modified: client/styles/containers/Dashboard.css
modified: client/utils/utils.js
modified: routes/stock.js
modified: routes/user.js
modified: schema/schema.sql
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: client/styles/atoms/NumberInput.css
modified: client/styles/components/StockForm.css
modified: client/styles/containers/Root.css
Freddies-MBP:Market-Data freddiejones$ git add client/styles/atoms/NumberInput.css
Freddies-MBP:Market-Data freddiejones$ git status
On branch b-input-misalignment
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: client/actions/stockActions.js
modified: client/actions/userActions.js
modified: client/components/Footer.js
modified: client/components/NavLoggedIn.js
modified: client/components/Portfolio.js
modified: client/components/PortfolioSummary.js
new file: client/components/SettingsForm.js
modified: client/components/Watchlist.js
modified: client/containers/Dashboard.js
modified: client/containers/IndexRedirect.js
modified: client/containers/Settings.js
modified: client/index.html
modified: client/index.js
modified: client/reducers/stock.js
modified: client/reducers/user.js
modified: client/styles/atoms/NumberInput.css
modified: client/styles/components/Portfolio.css
modified: client/styles/components/PortfolioSummary.css
modified: client/styles/components/PreviousTrades.css
modified: client/styles/components/Watchlist.css
modified: client/styles/containers/Dashboard.css
modified: client/utils/utils.js
modified: routes/stock.js
modified: routes/user.js
modified: schema/schema.sql
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: client/styles/components/StockForm.css
modified: client/styles/containers/Root.css
Freddies-MBP:Market-Data freddiejones$ git add client/styles/components/StockForm.css
Freddies-MBP:Market-Data freddiejones$ git status
On branch b-input-misalignment
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: client/actions/stockActions.js
modified: client/actions/userActions.js
modified: client/components/Footer.js
modified: client/components/NavLoggedIn.js
modified: client/components/Portfolio.js
modified: client/components/PortfolioSummary.js
new file: client/components/SettingsForm.js
modified: client/components/Watchlist.js
modified: client/containers/Dashboard.js
modified: client/containers/IndexRedirect.js
modified: client/containers/Settings.js
modified: client/index.html
modified: client/index.js
modified: client/reducers/stock.js
modified: client/reducers/user.js
modified: client/styles/atoms/NumberInput.css
modified: client/styles/components/Portfolio.css
modified: client/styles/components/PortfolioSummary.css
modified: client/styles/components/PreviousTrades.css
modified: client/styles/components/StockForm.css
modified: client/styles/components/Watchlist.css
modified: client/styles/containers/Dashboard.css
modified: client/utils/utils.js
modified: routes/stock.js
modified: routes/user.js
modified: schema/schema.sql
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: client/styles/containers/Root.css
Freddies-MBP:Market-Data freddiejones$ git add client/styles/containers/Root.css
Freddies-MBP:Market-Data freddiejones$ git status
On branch b-input-misalignment
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: client/actions/stockActions.js
modified: client/actions/userActions.js
modified: client/components/Footer.js
modified: client/components/NavLoggedIn.js
modified: client/components/Portfolio.js
modified: client/components/PortfolioSummary.js
new file: client/components/SettingsForm.js
modified: client/components/Watchlist.js
modified: client/containers/Dashboard.js
modified: client/containers/IndexRedirect.js
modified: client/containers/Settings.js
modified: client/index.html
modified: client/index.js
modified: client/reducers/stock.js
modified: client/reducers/user.js
modified: client/styles/atoms/NumberInput.css
modified: client/styles/components/Portfolio.css
modified: client/styles/components/PortfolioSummary.css
modified: client/styles/components/PreviousTrades.css
modified: client/styles/components/StockForm.css
modified: client/styles/components/Watchlist.css
modified: client/styles/containers/Dashboard.css
modified: client/styles/containers/Root.css
modified: client/utils/utils.js
modified: routes/stock.js
modified: routes/user.js
modified: schema/schema.sql
Freddies-MBP:Market-Data freddiejones$ git commit -m "fixed numberInput so that it's centered"
[b-input-misalignment 62b54e9] fixed numberInput so that it's centered
27 files changed, 292 insertions(+), 106 deletions(-)
create mode 100644 client/components/SettingsForm.js
Freddies-MBP:Market-Data freddiejones$ git pull upstream development
From https://github.com/RecursiveLogic/Market-Data
* branch development -> FETCH_HEAD
Auto-merging routes/stock.js
CONFLICT (content): Merge conflict in routes/stock.js
Auto-merging client/styles/components/StockForm.css
CONFLICT (content): Merge conflict in client/styles/components/StockForm.css
Auto-merging client/reducers/stock.js
CONFLICT (content): Merge conflict in client/reducers/stock.js
Auto-merging client/containers/Dashboard.js
CONFLICT (content): Merge conflict in client/containers/Dashboard.js
Auto-merging client/components/Watchlist.js
CONFLICT (content): Merge conflict in client/components/Watchlist.js
Auto-merging client/components/SettingsForm.js
CONFLICT (add/add): Merge conflict in client/components/SettingsForm.js
Auto-merging client/components/Portfolio.js
CONFLICT (content): Merge conflict in client/components/Portfolio.js
Auto-merging client/actions/stockActions.js
CONFLICT (content): Merge conflict in client/actions/stockActions.js
Automatic merge failed; fix conflicts and then commit the result.
Freddies-MBP:Market-Data freddiejones$ git branch
* b-input-misalignment
master
Freddies-MBP:Market-Data freddiejones$ git status
On branch b-input-misalignment
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
new file: client/atoms/InputResult.js
modified: client/atoms/NumberInput.js
modified: client/atoms/PortfolioItem.js
new file: client/atoms/WatchlistItem.js
modified: client/components/StockDetails.js
modified: client/components/StockForm.js
new file: client/styles/atoms/InputResult.css
new file: client/styles/atoms/PortfolioItem.css
new file: client/styles/atoms/WatchlistItem.css
modified: server.js
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: client/actions/stockActions.js
both modified: client/components/Portfolio.js
both added: client/components/SettingsForm.js
both modified: client/components/Watchlist.js
both modified: client/containers/Dashboard.js
both modified: client/reducers/stock.js
both modified: client/styles/components/StockForm.css
both modified: routes/stock.js
Freddies-MBP:Market-Data freddiejones$ git remote -v
origin https://github.com/BlindPacemaker/Market-Data.git (fetch)
origin https://github.com/BlindPacemaker/Market-Data.git (push)
upstream https://github.com/RecursiveLogic/Market-Data.git (fetch)
upstream https://github.com/RecursiveLogic/Market-Data.git (push)
Freddies-MBP:Market-Data freddiejones$ git fetch upstream
remote: Counting objects: 26, done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 26 (delta 1), reused 0 (delta 0), pack-reused 1
Unpacking objects: 100% (26/26), done.
From https://github.com/RecursiveLogic/Market-Data
3e122cc..9bd5027 development -> upstream/development
4479335..bc40bb5 master -> upstream/master
Freddies-MBP:Market-Data freddiejones$ git branch
* b-input-misalignment
master
Freddies-MBP:Market-Data freddiejones$ git pull upstream development
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Freddies-MBP:Market-Data freddiejones$ git branch
* b-input-misalignment
master
Freddies-MBP:Market-Data freddiejones$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment