0

I'm working on windows, Thanks for git professionals for any help on this.

PS G:\Solid\WebPortals> git status

On branch pos-event-waiver
nothing to commit, working tree clean
PS G:\Solid\WebPortals> git checkout pos-exchange-bill
error: Your local changes to the following files would be overwritten by checkout:
        Site/WebPortals/assets/typescript/pos/cart/waiver.component.ts
Please commit your changes or stash them before you switch branches.
Aborting

enter image description here

Zoe
  • 27,060
  • 21
  • 118
  • 148
Route2Me
  • 1
  • 3
  • Is that .ts file ignored on one or both of those two branches? – Lasse V. Karlsen Nov 27 '17 at 08:35
  • Thanks for replying, i already fixed this problem as mentioned in this [link](https://stackoverflow.com/questions/2016404/git-status-shows-modifications-git-checkout-file-doesnt-remove-them/2016426) – Route2Me Nov 28 '17 at 19:00
  • 1
    I'm sorry but each question must stand on its own, you can't expect people to go hunt through your other questions to see if there's more context. – Lasse V. Karlsen Nov 29 '17 at 07:43

1 Answers1

0

It is likely that your local branch pos-event-waiver is not set to track the remote branch. To fix this and track master branch, do:

git branch --set-upstream-to origin/master

Try git status now to get the status of your current branch, and you can commit or stash your changes, as required.

Supriya
  • 1,940
  • 24
  • 23
  • Thanks for replying, i already fixed this problem as mentioned in this [link](https://stackoverflow.com/questions/2016404/git-status-shows-modifications-git-checkout-file-doesnt-remove-them/2016426) – Route2Me Nov 28 '17 at 19:00