Microsoft Windows [Version 10.0.19044.
1889]
(c) Microsoft Corporation. All rights reserved.
C:\Tkxel-Projects\Client>git status
On branch harqam/amir/third-party-new-vendor-phase-2/ui-fixes
Your branch and 'origin/harqam/amir/third-party-new-vendor-phase-2/ui-fixes' have
diverged,
and have 54 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
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/app/third-party/all-vendor-list/vendor-detail/artifacts/artifacts.component.ts
no changes added to commit (use "git add" and/or "git commit -a")
C:\Tkxel-Projects\Client>git stash
Saved working directory and index state WIP on harqam/amir/third-party-new-vendor-
phase-2/ui-fixes: 43d2cea58 Vendor 4th Party Gap Modal UI issues, validations
issues, and vendor collection delete icon issues fixed
C:\Tkxel-Projects\Client>git stash list
stash@{0}: WIP on harqam/amir/third-party-new-vendor-phase-2/ui-fixes: 43d2cea58
Vendor 4th Party Gap Modal UI issues, validations issues, and vendor collection
delete icon issues fixed
C:\Tkxel-Projects\Client>git checkout amir/third-party-new-vendor-phase-2
Switched to a new branch 'amir/third-party-new-vendor-phase-2'
branch 'amir/third-party-new-vendor-phase-2' set up to track 'origin/amir/third-
party-new-vendor-phase-2'.
C:\Tkxel-Projects\Client>git status
On branch amir/third-party-new-vendor-phase-2
Your branch is up to date with 'origin/amir/third-party-new-vendor-phase-2'.
nothing to commit, working tree clean
C:\Tkxel-Projects\Client>git fetch origin
remote: Enumerating objects: 325, done.
remote: Counting objects: 100% (325/325), done.
remote: Compressing objects: 100% (136/136), done.
Receiving objects: 100% (325/325), 129.62 KiB | 344.00 KiB/s, done.0
Resolving deltas: 100% (252/252), completed with 126 local objects.
From https://github.com/cygov-tech/Client
26f5e70d2..fe179c9a8 amir/third-party-new-vendor-phase-2 -> origin/amir/third-
party-new-vendor-phase-2
d0829a763..76f283541 aib/dev -> origin/aib/dev
9bf0e68ac..44f711440 amir/dep7 -> origin/amir/dep7
5ce6a4565..49cb7fa75 amir/dev -> origin/amir/dev
f5fd39ab0..e35f34259 cygov/dev -> origin/cygov/dev
* [new branch]
dependabot/npm_and_yarn/amplify/backend/function/generateReport/src/xmldom/xmldom-
0.8.3 -> origin/dependabot/npm_and_yarn/amplify/backend/function/generateReport/
src/xmldom/xmldom-0.8.3
+ 1f4d4f2ee...d8e95b239 faiq/amir/fourth-party-table-fixes ->
origin/faiq/amir/fourth-party-table-fixes (forced update)
+ 1b8db2757...08ec51802 faiq/amir/questionnaire-tab-issues ->
origin/faiq/amir/questionnaire-tab-issues (forced update)
+ 8575c40ca...e8261b398 faiq/amir/vendor-collection-ui-fixes ->
origin/faiq/amir/vendor-collection-ui-fixes (forced update)
c371eea4d..5dee8920c irfan/temporary-branch-for-deployment ->
origin/irfan/temporary-branch-for-deployment
7f45eeae9..1162bbf4a maria/amir/risk-register-download-error ->
origin/maria/amir/risk-register-download-error
* [new branch] maria/amir/tags-are-shown-in-smart-filters ->
origin/maria/amir/tags-are-shown-in-smart-filters
* [new branch] mhassan/amir/ui-fixes-question-card ->
origin/mhassan/amir/ui-fixes-question-card
482b04cbe..52331eda1 osama/amir/upperdeck-scores ->
origin/osama/amir/upperdeck-scores
* [new branch] zain/amir/artifacts-issue-problem ->
origin/zain/amir/artifacts-issue-problem
C:\Tkxel-Projects\Client>git status
On branch amir/third-party-new-vendor-phase-2
Your branch is behind 'origin/amir/third-party-new-vendor-phase-2' by 10 commits,
and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean
C:\Tkxel-Projects\Client>git reset --hard origin/amir/third-party-new-vendor-phase-
2
HEAD is now at fe179c9a8 Merge pull request #5038 from
cygov-tech/faiq/amir/questionnaire-tab-issues
C:\Tkxel-Projects\Client>git checkout -b harqam/amir/disable-artifact-actions
Switched to a new branch 'harqam/amir/disable-artifact-actions'
C:\Tkxel-Projects\Client>git status
On branch harqam/amir/disable-artifact-actions
nothing to commit, working tree clean
C:\Tkxel-Projects\Client>git stash pop
Auto-merging
src/app/third-party/all-vendor-list/vendor-detail/artifacts/artifacts.component.ts
On branch harqam/amir/disable-artifact-actions
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/app/third-party/all-vendor-list/vendor-detail/artifacts/artifacts.component.ts
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (cf6c76fb469d15979319ad6cf136c0afe180ecb6)
C:\Tkxel-Projects\Client>
