Interested to Buy Any Domain ? << Click Here >> for more details...
What is a ‘conflict’ in git?
- 1 Answers
- 7 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 commands will you use to bring a new feature to the main branch?
What is the difference between rebasing and merge in git?
Explain the advantages of forking workflow?
What is the function of ‘git reset’?
What is ‘head’ in git and how many heads can be created in a repository?
In git, how would you return a commit that has just been pushed and made open?
What is another option for merging in git?
In git how do you revert a commit that has already been pushed and made public?
Name a few git commands and explain their usage.
What is subgit and why is it used?
What does ‘hooks’ consist of in git?
What is ‘git add’ is used for?
VSS 
