How will you resolve conflict in Git?

1.	How will you resolve conflict in Git?
Answer» Conflicts occur whenever there are multiple people working on the same FILE across multiple branches. In such cases, git won't be able to resolve it automatically as it is not capable of deciding what changes has to get the precedence. Following are the steps are DONE in order to resolve git conflicts: 1. Identify the FILES that have conflicts. 2. Discuss with members who have worked on the file and ensure that the required changes are done in the file. 3. Add these files to the STAGED SECTION by using the git add command. 4. Commit these changes using the git commit command. 5. Finally, push the changes to the branch using the git.

Discussion