During a pull action from a remote Git repository in Visual Studio, if you receive a conflict, all you need to do is a manual merge from a Remote or a Local Version.
Looking for Azure material from basics! Refer to this video on Azure provided by Intellipaat:
Then click "Accept Merge", now you have to commit this merge operation.
For this, check the screenshot below:
If it doesn't show up, next you can do is commit from pendings, now you can see in the below screenshot that there is nothing Changes tab, it is due to the local version after you merge. You won't see any changes in the file but still you need to commit these merge operations
