Archive for the ‘Git’ Category

How to resolve git conflict

git conflict revert

First of all, I would like to say that I don’t know much about git. I started using git from last week onwards and I could resolve a git conflict in the following way:

  1. Identify the conflicted files.
  2. Go to the folder of the files conflicted.
  3. Take a backup of the files.
  4. Then use the below command to replace the files conflicted with most recent git commit: