git resolve conflict using theirs 1

git resolve conflict using theirs

git pull -X theirs

Here is what the above code is Doing:
1. git pull -X theirs
2. git add .
3. git commit -m “Merge conflict resolved”
4. git push

Similar Posts