Interested to Buy Any Domain ? << Click Here >> for more details...
How to resolve a conflict in git?
- 1 Answers
- 8 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 is the use of ‘git log’?
What is the function of ‘git reset’?
What is subgit and why is it used?
What is the function of ‘git stash apply’?
What is the command you can use to write a commit message?
What is git Is-tree?
How many heads can be created in a repository?
Explain the difference between reverting and resetting.
What is git fork? What is the difference between fork, branch, and clone?
What is Subgit? Why to use Subgit?
Name a few git commands?
What is the difference between GIT and SVN?
VSS 
