Different steps to resolve a conflict in Git in any files?

1.	Different steps to resolve a conflict in Git in any files?
Answer» Different steps to resolve a conflict in Git in any files? Below are the FOUR main steps to resolve the conflict in Git in any files:- (1)FIRST need to identify the files that have the conflict. (2)Now make the necessary CHANGES in the files so that the conflict will never arise again. (3)Now in third STEP is to add files by the command git add (4)Now the last steps is to commit the changed file using the command git commit

Discussion