278k points Registered user
The following steps will resolve conflict in Git-
Identify the files that have caused the conflict.
Make the necessary changes in the files so that conflict does not arise again.
Add these files by the command git add.
Finally to commit the changed file using the command git commit
Get access to your account and question