D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.

2_V01-06-
00\CUB.MSD.Web.Angular>git pull origin develop
Password for 'https://nycerdeen@bitbucket.org':
remote: Counting objects: 34, done.remote: Compressing objects: 100% (34/34), done.
remote: Total 34 (delta 23), reused 0 (delta 0)
Unpacking objects: 100% (34/34), done.
From https://bitbucket.org/nldc/avatar-crm-dynamics

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git status
On branch develop
Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)

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: src/app/controls/cub-
customizablegrid/cub_customizablegrid.component.ts modified: src/app/tam-
statement-invoices/tam-statement-invoices.component.ts
modified: src/app/tam-transactions/tam-transactions.component.ts
modified: src/assets/scripts/tam_transitaccount_main.js
modified: src/assets/styles/font-awesome/package.json

Untracked files:
(use "git add <file>..." to include in what will be committed)

src/assets/styles/font-awesome/package-lock.json

no changes added to commit (use "git add" and/or "git commit -a")

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git checkout src/assets/styles/font-awesome/package.json

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git checkout src/app/controls/cub-
customizablegrid/cub_customizablegrid.component.ts

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git status
On branch develop
Your branch is behind 'origin/develop' by 3 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)

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: src/app/tam-statement-invoices/tam-statement-
invoices.component.ts
modified: src/app/tam-transactions/tam-transactions.component.ts
modified: src/assets/scripts/tam_transitaccount_main.js

Untracked files:
(use "git add <file>..." to include in what will be committed)

src/assets/styles/font-awesome/package-lock.json
no changes added to commit (use "git add" and/or "git commit -a")

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git commit -a -m "Grid Actions in Travel History"
[develop e3c5164] Grid Actions in Travel History
3 files changed, 104 insertions(+), 4 deletions(-)

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git pull origin develop
Password for 'https://nycerdeen@bitbucket.org':
From https://bitbucket.org/nldc/avatar-crm-dynamics
* branch develop -> FETCH_HEAD
Auto-merging NextContactMSD_R8.2_V01-06-
00/CUB.MSD.Web.Angular/src/assets/scripts/tam_transitaccount_main.js
CONFLICT (content): Merge conflict in NextContactMSD_R8.2_V01-06-
00/CUB.MSD.Web.Angular/src/assets/scripts/tam_transitaccount_main.js
Automatic merge failed; fix conflicts and then commit the result.

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git status
On branch develop
Your branch and 'origin/develop' have diverged,
and have 1 and 3 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)

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/app/tam-balance-history/tam-balance-history.component.html
modified: src/app/tam-balance-history/tam-balance-history.component.ts
modified: src/app/tam-notification-history/tam-notification-
history.component.ts
modified: src/app/tam-statement-invoices/tam-statement-
invoices.component.html

Unmerged paths:
(use "git add <file>..." to mark resolution)

both modified: src/assets/scripts/tam_transitaccount_main.js

Untracked files:
(use "git add <file>..." to include in what will be committed)

src/assets/styles/font-awesome/package-lock.json

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git add src/assets/scripts/tam_transitaccount_main.js

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git status
On branch develop
Your branch and 'origin/develop' have diverged,
and have 1 and 3 different commits each, respectively.
 (use "git pull" to merge the remote branch into yours)

All conflicts fixed but you are still merging.

(use "git commit" to conclude merge)

Changes to be committed:

modified: package-lock.json
modified: package.json
modified: src/app/tam-balance-history/tam-balance-history.component.html
modified: src/app/tam-balance-history/tam-balance-history.component.ts
modified: src/app/tam-notification-history/tam-notification-
history.component.ts
modified: src/app/tam-statement-invoices/tam-statement-
invoices.component.html
modified: src/assets/scripts/tam_transitaccount_main.js

Untracked files:
(use "git add <file>..." to include in what will be committed)

src/assets/styles/font-awesome/package-lock.json

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git commit -a -m "Conflict Fixes"
[develop e3a8561] Conflict Fixes

D:\CRM_Workspace\avatar-crm-dynamics\NextContactMSD_R8.2_V01-06-
00\CUB.MSD.Web.Angular>git push origin develop
Password for 'https://nycerdeen@bitbucket.org':
Enumerating objects: 45, done.

Path D:\CRM_Workspace\CUB.MSD.Web.Angular