How can conflict in git resolved?
- 1 Answers
- 87 Views
- I also Faced
- E-Mail Answers
Answer / Indu Singh
Resolving conflicts in Git can be done manually or automatically. For manual resolution, Git indicates the conflicting files with a message and marks the conflicting areas using '<<<<<<<', '=======', and '>>>>>>>'. You need to manually edit the file by merging the changes from both branches. For automatic resolution, use the command 'git merge --no-commit' followed by 'git automerge' or 'git diff --merge'. This will automatically attempt to merge the files.
| Is This Answer Correct ? | 0 Yes | 0 No |
What are the benefits of using version control system?
What is git reflog?
What is the purpose of branching in GIT?
How will you know in git if a branch has already been merged into master?
What is “Staging Area” or “Index” in GIT?
What is GIT stash drop?
What does commit object contain?
what is git fork? What is difference between fork and branch? How to create tag?
What is ‘git add’ is used for?
What is git bisect and what is its purpose?
What is a repository and how will you create it?
Why is it desirable to create an additional commit rather than amending an existing commit?
VSS 
