Interested to Buy Any Domain ? << Click Here >> for more details...
What is a ‘conflict’ in git?
- 1 Answers
- 11 Views
- I also Faced
- E-Mail Answers
Answer / Ram Vijay Singh
A conflict in Git occurs when the same file has conflicting changes from different branches during a merge operation. Git marks these conflicts and leaves it to the user to resolve them manually.
| Is This Answer Correct ? | 0 Yes | 0 No |
What is ‘head’ in git?
Why is it advisable to create an additional commit rather than amending an existing commit?
How can you use git bisect to determine the source of a (regression) bug?
What commands will you use to bring a new feature to the main branch?
What is the command you can use to write a commit message?
What are git repository hosting services you used?
What is the function of ‘git stash apply’?
What does ‘hooks’ comprise of in git?
What is a distributed vcs?
To delete a branch what is the command that is used?
How to remove a file from git without removing it from your file system?
What is the purpose of branching in GIT?
VSS 
