Interested to Buy Any Domain ? << Click Here >> for more details...
How can conflict in git resolved?
- 1 Answers
- 12 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 a repository and how will you create it?
How can you create a repository in Git?
What is git fork?
What is the use of ‘git log’?
What is the syntax for “Rebasing” in Git?
What is ‘bare repository’ in GIT?
How can you use git bisect to determine the source of a (regression) bug?
What is the difference between git pull and git fetch?
Mention some of the best graphical GIT client for LINUX?
Explain what is commit message?
What is ‘git add’ is used for?
What is another option for merging in git?
VSS 
