Interested to Buy Any Domain ? << Click Here >> for more details...
How can conflict in git resolved?
- 1 Answers
- 7 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 is git bisect?
What is the function of ‘git reset’?
How to rebase master in git?
What is the function of git clone?
Explain the difference between rebase and merge?
Name some git commands and also explain their functions?
What is a repository and how will you create it?
How can you use git bisect to determine the source of a (regression) bug?
What is the difference between git pull and git fetch?
Explain git stash, pop?
What is git fork? How to create tag?
What is the function of ‘git diff ’ in git?
VSS 
