Skip to content

Instantly share code, notes, and snippets.

@dereknahman

dereknahman/gist:3ed23bc904b7ab9634245d3b7984f88a

Created June 18, 2021 15:37
Show Gist options
  • Save dereknahman/3ed23bc904b7ab9634245d3b7984f88a to your computer and use it in GitHub Desktop.
Save dereknahman/3ed23bc904b7ab9634245d3b7984f88a to your computer and use it in GitHub Desktop.
Download ZIP
git hell
Raw
gistfile1.txt
~/Doc/w/spark-contributors feature/cont..able-filters *1 !1 gst ok 12s 15:08:19
On branch feature/contributor-table-filters
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: src/client/constants.js
no changes added to commit (use "git add" and/or "git commit -a")
~/Doc/w/spark-contributors feature/cont..able-filters *1 !1 git add . ok 15:08:25
~/Doc/w/spark-contributors feature/cont..able-filters *1 +1 git commit -m 'add contract status obj' ok 15:08:26
husky > pre-commit (node v14.16.1)
✔ Preparing...
✔ Running tasks...
✔ Applying modifications...
✔ Cleaning up...
[feature/contributor-table-filters b522bb5] add contract status obj
1 file changed, 1 insertion(+)
~/Doc/w/spark-contributors feature/cont..able-filters *1 git push origin feature/contributor-table-filters ok 15:08:42
Enumerating objects: 9, done.
Counting objects: 100% (9/9), done.
Delta compression using up to 8 threads
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 452 bytes | 452.00 KiB/s, done.
Total 5 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
To github.com:Financial-Times/spark-contributors.git
d348e76..b522bb5 feature/contributor-table-filters -> feature/contributor-table-filters
~/Doc/w/spark-contributors feature/cont..able-filters *1 git fetch origin ok 3s 15:08:54
remote: Enumerating objects: 285, done.
remote: Counting objects: 100% (285/285), done.
remote: Compressing objects: 100% (130/130), done.
remote: Total 285 (delta 185), reused 248 (delta 154), pack-reused 0
Receiving objects: 100% (285/285), 45.97 KiB | 7.66 MiB/s, done.
Resolving deltas: 100% (185/185), completed with 22 local objects.
From github.com:Financial-Times/spark-contributors
a1b7dca..e92e290 main -> origin/main
* [new branch] multiselect-payments -> origin/multiselect-payments
* [new branch] overflow-table -> origin/overflow-table
~/Doc/w/spark-contributors feature/cont..able-filters *1 git merge main ok 15:36:53
Already up to date.
~/Doc/w/spark-contributors feature/cont..able-filters *1 git checkout main ok 15:37:03
Switched to branch 'main'
Your branch is behind 'origin/main' by 18 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
~/Documents/work/spark-contributors main <18 *1 git pull origin main ok 15:37:14
From github.com:Financial-Times/spark-contributors
* branch main -> FETCH_HEAD
Updating a1b7dca..e92e290
Fast-forward
package-lock.json | 14 ++---
package.json | 2 +-
src/client/App.jsx | 12 ++++
src/client/AppProvider.jsx | 7 ++-
src/client/components/CommissionDetails/index.jsx | 123 +++++++++++++++++++++++++++++++++++++++
src/client/components/CommissionDetails/styles.scss | 11 ++++
src/client/components/CommissionsControls/index.js | 33 +++++------
src/client/components/CommissionsControls/styles.scss | 7 ++-
src/client/components/CommissionsDashboard/index.js | 7 +++
src/client/components/CommissionsTable/CommissionsTableItems.jsx | 34 ++++++-----
src/client/components/CommissionsTable/index.jsx | 2 +
src/client/components/ContributorDetails/index.jsx | 129 +++++++++++++++++++++++++++++++++++++++++
src/client/components/ContributorDetails/styles.scss | 11 ++++
src/client/components/ContributorsTable/ContributorsTableItems.jsx | 4 +-
src/client/components/ContributorsTable/index.jsx | 4 +-
src/client/effects/useApprovals.js | 119 ++++++++++++++------------------------
src/client/effects/useApprovals.spec.js | 107 +++++++++++++---------------------
src/client/effects/usePaymentRequests.js | 36 ++++++++++++
src/client/effects/usePaymentRequests.spec.js | 96 ++++++++++++++++++++++++++++++
src/client/effects/useSelectedCommissions.js | 25 ++++++++
src/client/effects/useSelectedCommissions.spec.js | 48 +++++++++++++++
src/client/utils/detailHelpers.js | 33 +++++++++++
src/client/utils/stringUtils.js | 9 ++-
src/client/utils/stringUtils.spec.js | 6 +-
src/server/db/models/{financeRequest.js => paymentRequest.js} | 6 +-
src/server/routes/financeRequests/index.js | 11 ----
.../{financeRequests/createFinanceRequest.js => paymentRequests/createPaymentRequest.js} | 44 +++++++++-----
.../createFinanceRequest.spec.js => paymentRequests/createPaymentRequest.spec.js} | 138 +++++++++++++++++++++++++++++++++-----------
.../routes/{financeRequests/getFinanceRequest.js => paymentRequests/getPaymentRequest.js} | 24 ++++----
.../getFinanceRequest.spec.js => paymentRequests/getPaymentRequest.spec.js} | 56 +++++++++---------
src/server/routes/paymentRequests/index.js | 11 ++++
src/server/server.js | 4 +-
32 files changed, 874 insertions(+), 299 deletions(-)
create mode 100644 src/client/components/CommissionDetails/index.jsx
create mode 100644 src/client/components/CommissionDetails/styles.scss
create mode 100644 src/client/components/ContributorDetails/index.jsx
create mode 100644 src/client/components/ContributorDetails/styles.scss
create mode 100644 src/client/effects/usePaymentRequests.js
create mode 100644 src/client/effects/usePaymentRequests.spec.js
create mode 100644 src/client/effects/useSelectedCommissions.js
create mode 100644 src/client/effects/useSelectedCommissions.spec.js
create mode 100644 src/client/utils/detailHelpers.js
rename src/server/db/models/{financeRequest.js => paymentRequest.js} (75%)
delete mode 100644 src/server/routes/financeRequests/index.js
rename src/server/routes/{financeRequests/createFinanceRequest.js => paymentRequests/createPaymentRequest.js} (83%)
rename src/server/routes/{financeRequests/createFinanceRequest.spec.js => paymentRequests/createPaymentRequest.spec.js} (64%)
rename src/server/routes/{financeRequests/getFinanceRequest.js => paymentRequests/getPaymentRequest.js} (57%)
rename src/server/routes/{financeRequests/getFinanceRequest.spec.js => paymentRequests/getPaymentRequest.spec.js} (59%)
create mode 100644 src/server/routes/paymentRequests/index.js
~/Documents/work/spark-contributors main *1 git checkout -b feature/contributor-table-filters origin/feature/contributor-table-filters
fatal: A branch named 'feature/contributor-table-filters' already exists.
~/Documents/work/spark-contributors main *1 git checkout feature/contributor-table-filters 128 err 15:37:37
Switched to branch 'feature/contributor-table-filters'
~/Doc/w/spark-contributors feature/cont..able-filters *1 git merge main ok 15:37:50
Removing src/server/routes/financeRequests/index.js
Auto-merging src/client/components/ContributorsTable/index.jsx
CONFLICT (content): Merge conflict in src/client/components/ContributorsTable/index.jsx
Auto-merging src/client/components/ContributorsTable/ContributorsTableItems.jsx
Automatic merge failed; fix conflicts and then commit the result.
~/Doc/w/spark-contributors feature/cont..able-filters *1 merge ~1 +36 git merge --abort 1 err 15:37:56
~/Doc/w/spark-contributors feature/cont..able-filters *1 git log --merge ok 15:38:16
fatal: --merge without MERGE_HEAD?
~/Doc/w/spark-contributors feature/cont..able-filters *1 git branch 128 err 15:40:43
~/Doc/w/spark-contributors feature/cont..able-filters *1 gst ok 15:41:30
On branch feature/contributor-table-filters
nothing to commit, working tree clean
~/Doc/w/spark-contributors feature/cont..able-filters *1 git pull origin main ok 15:42:13
From github.com:Financial-Times/spark-contributors
* branch main -> FETCH_HEAD
Removing src/server/routes/financeRequests/index.js
Auto-merging src/client/components/ContributorsTable/index.jsx
CONFLICT (content): Merge conflict in src/client/components/ContributorsTable/index.jsx
Auto-merging src/client/components/ContributorsTable/ContributorsTableItems.jsx
Automatic merge failed; fix conflicts and then commit the result.
~/Doc/w/spark-contributors feature/cont..able-filters *1 merge ~1 +36 git merge --abort 1 err 15:45:32
~/Doc/w/spark-contributors feature/cont..able-filters *1 git checkout main ok 15:47:41
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
~/Documents/work/spark-contributors main *1 git checkout feature/contributor-table-filters ok 15:47:44
Switched to branch 'feature/contributor-table-filters'
~/Doc/w/spark-contributors feature/cont..able-filters *1 git pull origin main ok 15:48:39
From github.com:Financial-Times/spark-contributors
* branch main -> FETCH_HEAD
Removing src/server/routes/financeRequests/index.js
Auto-merging src/client/components/ContributorsTable/index.jsx
CONFLICT (content): Merge conflict in src/client/components/ContributorsTable/index.jsx
Auto-merging src/client/components/ContributorsTable/ContributorsTableItems.jsx
Automatic merge failed; fix conflicts and then commit the result.
~/Doc/w/spark-contributors feature/cont..able-filters *1 merge ~1 +36 gst 1 err 15:48:51
On branch feature/contributor-table-filters
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: package-lock.json
modified: package.json
modified: src/client/App.jsx
modified: src/client/AppProvider.jsx
new file: src/client/components/CommissionDetails/index.jsx
new file: src/client/components/CommissionDetails/styles.scss
modified: src/client/components/CommissionsControls/index.js
modified: src/client/components/CommissionsControls/styles.scss
modified: src/client/components/CommissionsDashboard/index.js
modified: src/client/components/CommissionsTable/CommissionsTableItems.jsx
modified: src/client/components/CommissionsTable/index.jsx
new file: src/client/components/ContributorDetails/index.jsx
new file: src/client/components/ContributorDetails/styles.scss
modified: src/client/components/ContributorsTable/ContributorsTableItems.jsx
modified: src/client/effects/useApprovals.js
modified: src/client/effects/useApprovals.spec.js
new file: src/client/effects/usePaymentRequests.js
new file: src/client/effects/usePaymentRequests.spec.js
new file: src/client/effects/useSelectedCommissions.js
new file: src/client/effects/useSelectedCommissions.spec.js
new file: src/client/utils/detailHelpers.js
modified: src/client/utils/stringUtils.js
modified: src/client/utils/stringUtils.spec.js
renamed: src/server/db/models/financeRequest.js -> src/server/db/models/paymentRequest.js
deleted: src/server/routes/financeRequests/index.js
renamed: src/server/routes/financeRequests/createFinanceRequest.js -> src/server/routes/paymentRequests/createPaymentRequest.js
renamed: src/server/routes/financeRequests/createFinanceRequest.spec.js -> src/server/routes/paymentRequests/createPaymentRequest.spec.js
renamed: src/server/routes/financeRequests/getFinanceRequest.js -> src/server/routes/paymentRequests/getPaymentRequest.js
renamed: src/server/routes/financeRequests/getFinanceRequest.spec.js -> src/server/routes/paymentRequests/getPaymentRequest.spec.js
new file: src/server/routes/paymentRequests/index.js
modified: src/server/server.js
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/client/components/ContributorsTable/index.jsx
~/Doc/w/spark-contributors feature/cont..able-filters *1 merge ~1 +36 gst ok 16:24:41
On branch feature/contributor-table-filters
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/client/components/ContributorsTable/index.jsx
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: package-lock.json
modified: package.json
modified: src/client/App.jsx
modified: src/client/AppProvider.jsx
modified: src/client/components/CommissionsControls/index.js
modified: src/client/components/CommissionsControls/styles.scss
modified: src/client/components/CommissionsDashboard/index.js
modified: src/client/components/CommissionsTable/CommissionsTableItems.jsx
modified: src/client/components/CommissionsTable/index.jsx
modified: src/client/components/ContributorsTable/ContributorsTableItems.jsx
modified: src/client/effects/useApprovals.js
modified: src/client/effects/useApprovals.spec.js
modified: src/client/utils/stringUtils.js
modified: src/client/utils/stringUtils.spec.js
deleted: src/server/db/models/financeRequest.js
deleted: src/server/routes/financeRequests/createFinanceRequest.js
deleted: src/server/routes/financeRequests/createFinanceRequest.spec.js
deleted: src/server/routes/financeRequests/getFinanceRequest.js
deleted: src/server/routes/financeRequests/getFinanceRequest.spec.js
deleted: src/server/routes/financeRequests/index.js
modified: src/server/server.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/client/components/CommissionDetails/
src/client/components/ContributorDetails/
src/client/effects/usePaymentRequests.js
src/client/effects/usePaymentRequests.spec.js
src/client/effects/useSelectedCommissions.js
src/client/effects/useSelectedCommissions.spec.js
src/client/utils/detailHelpers.js
src/server/db/models/paymentRequest.js
src/server/routes/paymentRequests/
no changes added to commit (use "git add" and/or "git commit -a")
~/Doc/w/spark-contributors feature/cont..able-filters *1 merge ~1 !21 ?9 git pull origin main ok 16:25:35
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.
~/Doc/w/spark-contributors feature/cont..able-filters *1 merge ~1 !21 ?9 git add src/client/components/ContributorsTable/index.jsx
~/Doc/w/spark-contributors feature/cont..able-filters *1 merge +1 !21 ?9 git commit -m 'resolve merge conflict' ok 16:27:11
husky > pre-commit (node v14.16.1)
✔ Preparing...
✔ Running tasks...
✔ Applying modifications...
✔ Cleaning up...
[feature/contributor-table-filters de73440] resolve merge conflict
~/Doc/w/spark-contributors feature/cont..able-filters *1 !21 ?9 gst ok 16:27:23
On branch feature/contributor-table-filters
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: package-lock.json
modified: package.json
modified: src/client/App.jsx
modified: src/client/AppProvider.jsx
modified: src/client/components/CommissionsControls/index.js
modified: src/client/components/CommissionsControls/styles.scss
modified: src/client/components/CommissionsDashboard/index.js
modified: src/client/components/CommissionsTable/CommissionsTableItems.jsx
modified: src/client/components/CommissionsTable/index.jsx
modified: src/client/components/ContributorsTable/ContributorsTableItems.jsx
modified: src/client/effects/useApprovals.js
modified: src/client/effects/useApprovals.spec.js
modified: src/client/utils/stringUtils.js
modified: src/client/utils/stringUtils.spec.js
deleted: src/server/db/models/financeRequest.js
deleted: src/server/routes/financeRequests/createFinanceRequest.js
deleted: src/server/routes/financeRequests/createFinanceRequest.spec.js
deleted: src/server/routes/financeRequests/getFinanceRequest.js
deleted: src/server/routes/financeRequests/getFinanceRequest.spec.js
deleted: src/server/routes/financeRequests/index.js
modified: src/server/server.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/client/components/CommissionDetails/
src/client/components/ContributorDetails/
src/client/effects/usePaymentRequests.js
src/client/effects/usePaymentRequests.spec.js
src/client/effects/useSelectedCommissions.js
src/client/effects/useSelectedCommissions.spec.js
src/client/utils/detailHelpers.js
src/server/db/models/paymentRequest.js
src/server/routes/paymentRequests/
no changes added to commit (use "git add" and/or "git commit -a")
~/Doc/w/spark-contributors feature/cont..able-filters *1 !21 ?9 gst ok 16:27:26
On branch feature/contributor-table-filters
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: package-lock.json
modified: package.json
modified: src/client/App.jsx
modified: src/client/AppProvider.jsx
modified: src/client/components/CommissionsControls/index.js
modified: src/client/components/CommissionsControls/styles.scss
modified: src/client/components/CommissionsDashboard/index.js
modified: src/client/components/CommissionsTable/CommissionsTableItems.jsx
modified: src/client/components/CommissionsTable/index.jsx
modified: src/client/components/ContributorsTable/ContributorsTableItems.jsx
modified: src/client/effects/useApprovals.js
modified: src/client/effects/useApprovals.spec.js
modified: src/client/utils/stringUtils.js
modified: src/client/utils/stringUtils.spec.js
deleted: src/server/db/models/financeRequest.js
deleted: src/server/routes/financeRequests/createFinanceRequest.js
deleted: src/server/routes/financeRequests/createFinanceRequest.spec.js
deleted: src/server/routes/financeRequests/getFinanceRequest.js
deleted: src/server/routes/financeRequests/getFinanceRequest.spec.js
deleted: src/server/routes/financeRequests/index.js
modified: src/server/server.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/client/components/CommissionDetails/
src/client/components/ContributorDetails/
src/client/effects/usePaymentRequests.js
src/client/effects/usePaymentRequests.spec.js
src/client/effects/useSelectedCommissions.js
src/client/effects/useSelectedCommissions.spec.js
src/client/utils/detailHelpers.js
src/server/db/models/paymentRequest.js
src/server/routes/paymentRequests/
no changes added to commit (use "git add" and/or "git commit -a")
~/Doc/w/spark-contributors feature/cont..able-filters *1 !21 ?9 git reset --hard ok 16:28:44
HEAD is now at de73440 resolve merge conflict
~/Doc/w/spark-contributors feature/cont..able-filters *1 ?9 gst ok 16:30:11
On branch feature/contributor-table-filters
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/client/components/CommissionDetails/
src/client/components/ContributorDetails/
src/client/effects/usePaymentRequests.js
src/client/effects/usePaymentRequests.spec.js
src/client/effects/useSelectedCommissions.js
src/client/effects/useSelectedCommissions.spec.js
src/client/utils/detailHelpers.js
src/server/db/models/paymentRequest.js
src/server/routes/paymentRequests/
nothing added to commit but untracked files present (use "git add" to track)
~/Doc/w/spark-contributors feature/cont..able-filters *1 ?9 git reflog ok 16:30:17
~/Doc/w/spark-contributors feature/cont..able-filters *1 ?9 git reset --hard a1b7dca ok 40s 16:31:46
HEAD is now at a1b7dca Merge pull request #89 from Financial-Times/feature/form-fields-match-prototype
~/Doc/w/spark-contributors feature/cont..able-filters *1 ?9 gst ok 16:31:55
On branch feature/contributor-table-filters
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/client/components/CommissionDetails/
src/client/components/ContributorDetails/
src/client/effects/usePaymentRequests.js
src/client/effects/usePaymentRequests.spec.js
src/client/effects/useSelectedCommissions.js
src/client/effects/useSelectedCommissions.spec.js
src/client/utils/detailHelpers.js
src/server/db/models/paymentRequest.js
src/server/routes/paymentRequests/
nothing added to commit but untracked files present (use "git add" to track)
~/Doc/w/spark-contributors feature/cont..able-filters *1 ?9 git checkout main ok 16:32:00
error: The following untracked working tree files would be overwritten by checkout:
src/client/components/CommissionDetails/index.jsx
src/client/components/CommissionDetails/styles.scss
src/client/components/ContributorDetails/index.jsx
src/client/components/ContributorDetails/styles.scss
src/client/effects/usePaymentRequests.js
src/client/effects/usePaymentRequests.spec.js
src/client/effects/useSelectedCommissions.js
src/client/effects/useSelectedCommissions.spec.js
src/client/utils/detailHelpers.js
src/server/db/models/paymentRequest.js
src/server/routes/paymentRequests/createPaymentRequest.js
src/server/routes/paymentRequests/createPaymentRequest.spec.js
src/server/routes/paymentRequests/getPaymentRequest.js
src/server/routes/paymentRequests/getPaymentRequest.spec.js
src/server/routes/paymentRequests/index.js
Please move or remove them before you switch branches.
Aborting
~/Doc/w/spark-contributors feature/cont..able-filters *1 ?9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment