Commands and Steps for resolving Merge conflict in Git

Search Unix Commands/Scripts

Help us in improving the repository. Add new commands/scripts through 'Submit Commands/Scripts ' link.

Submit Commands/Scripts

Unix Commands/Scripts

Sample 1. Commands and Steps for resolving Merge conflict in Git

git fetch ( it will only bring the remote code to local but won't attempt to merge )

git status ( will show the merge conflicts )

Fix the Merge conflicts

git add .

git commit 

git push

_{Like Feedback}