davidshq, to NoStupidQuestions
@davidshq@hachyderm.io avatar

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

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

A git status shows everything is great but five seconds later 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

claras_universe, to vscode
@claras_universe@ieji.de avatar

Obsessed with the new VSC theme I found thanks to @martijn hehe (Its Cattpuccin Mocha!). Especially loving the lil icons it adds to some folders, super cute x-x #development #coding #vsc #vscode #python

chrisonline, to javascript
@chrisonline@androiddev.social avatar

After some game time, let's do some #coding again.
Need to finish my #vue project.

Currently working on the responsive design.
Hopefully I can get it live soon.

#code #coder #developing #development #visualstudiocode #vsc #javascript #typescript

<div class="d-flex justify-center align-center mx-auto mb-6 mt-6 flex-wrap flex-md-nowrap">  
  • All
  • Subscribed
  • Moderated
  • Favorites
  • megavids
  • rosin
  • ngwrru68w68
  • Durango
  • DreamBathrooms
  • mdbf
  • magazineikmin
  • thenastyranch
  • Youngstown
  • khanakhh
  • slotface
  • everett
  • vwfavf
  • kavyap
  • provamag3
  • osvaldo12
  • GTA5RPClips
  • ethstaker
  • tacticalgear
  • InstantRegret
  • cisconetworking
  • cubers
  • tester
  • anitta
  • modclub
  • Leos
  • normalnudes
  • JUstTest
  • All magazines