0 votes
in Technology by (321k points)

How to resolve a conflict in Git?

1 Answer

0 votes
by (321k points)

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

Related questions

0 votes
1 answer
0 votes
1 answer
asked Nov 3, 2020 in Technology by JackTerrance (321k points)
0 votes
1 answer
...