Join devRant
Do all the things like
++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatar
Sign Up
Pipeless API
From the creators of devRant, Pipeless lets you power real-time personalized recommendations and activity feeds using a simple API
Learn More
-
@iSwimInTheC firacode :)
-
@billgates why would it be sarcasm?
-
@tahnik Accept both changes.
How can you accept 2 changes when you have a merge conflict? Isn't it usually Mine's, Their's or manually edit? -
@billgates ah no this was about the merging feature of VSCode. I haven't seen it anywhere
-
@tahnik @billgates most of the conflixts are one empty line conflicts, in that case you want it both.
-
@dontbeevil @bittersweet for a text editor this is pretty sick.
-
@tahnik True! Although the fact that it has features like these, shoves it a bit more towards the IDE side of the spectrum.
-
@cornyg is it a plugin? If it is, which one?
-
@cornyg It's built in
-
@siksik built in :) automatic if you get a merge conflict
A dev can dream, right...?
When you try to dive deep into the docs.
oops
VSCode, just let me kiss you!
This is so fucking good :( :(. Fixing conflict has never been so easier.
undefined
vscode