Resolving Merge Conflicts using Command Line

In this video, I have demonstrated that how to resolve merge conflicts using Command Line .

For more understanding read the article :-

Subscribe the channel for more such amazing videos .

[KasunDulanjana-ibks]

Title doesn't match with the video content. You should resolve the conflicts from the terminal not from the VS Code.

[znefas]

The tutorial does not explain the mechanics by which git decides which changes to keep, or how to apply those changes without relying on a specific IDE's features.

[Chai-T-Rex]

Why are you claiming to resolve them using the command line when you use an IDE to accept the changes? That does not at all help me to know how to do that via the command line.

[nqnqnq]

accurate title: Resolving Merge Conflicts using VSCode.

[mohamedtroufi]

the best guy i ever watched in my life, thank you man, you really made my day go as i hoped.

[ascherfriedman]

What tools do you use to have these little "accept changes" button above?

[nageshkumarsingh]

I cant see accept both changes in vs code editor while merge conflict

[Jorma___]

This title doesn't match this video at all. You only did checkout and merge on command line, the actual Merge Conflict you did resolve through VS Code

[SaadShah]

you said you will resolve merge conflict using command line but you are using VS code for it, waste of time really

[peartamicia]

Bad tutorial. You resolved it in vs code by clicking "Accept both changes".