0
How to resolve a conflict in Git?

Open 1 Answers 27 Views Technology

How to resolve a conflict in Git?

1 Answer

0

The following steps will resolve conflict in Git-

  1. Identify the files that have caused the conflict.

  2. Make the necessary changes in the files so that conflict does not arise again.

  3. Add these files by the command git add.

  4. Finally to commit the changed file using the command git commit

by (278k points)
...