davidshq, 14 days ago

I've got a strange one for all my #coding friends today.

I rebased a local branch of a repo and did the usual #git push --force to overwrite the remote branch.

A git status shows everything is great but five seconds later #VSC is showing the same conflict due to the diverging branches.

If I exit out of VSC I can run git push --force and the conflict doesn't return.

I can open the files in WebStorm and all is fine.

But the moment I open VSC the conflict returns

#question #problem #help