Interested to Buy Any Domain ? << Click Here >> for more details...
How to resolve a conflict in git?
- 1 Answers
- 3 Views
- I also Faced
- E-Mail Answers
Answer / Sheelvant
To resolve a conflict in Git, follow these steps:n1. Pull or merge the conflicting branches: $ git pull --rebase origin branch-namen2. Resolve the conflicts by editing the files that have conflict markers (<<<<<<<, =======, and >>>>>>>). Save the changes and remove the conflict markers.n3. Add the resolved files to the index using `git add <file>`.n4. Commit the changes with a message explaining the resolution: $ git commit -m 'Resolved merge conflicts'.
| Is This Answer Correct ? | 0 Yes | 0 No |
What does ‘hooks’ comprise of in git?
Explain the gitflow workflow?
What is a repository and how will you create it?
What is subgit and why is it used?
What is git fork? What is the difference between fork, branch, and clone?
Name a few git commands and explain their usage.
How do you find a list of files that have changed in a particular commit?
What is the difference between ‘git remote’ and ‘git clone’?
What is the command you can use to write a commit message?
What is the use of ‘git log’?
How can you fix a broken commit?
In git, how would you return a commit that has just been pushed and made open?
VSS 
