..../$:bshubh@laravel MINGW6 /c/xampp/htdocs/xyzproject (shubham|MERGING) issues
1- Undo the merge and pull again.
To undo a merge:
git merge --abort [Since git version 1.7.4]
git reset --merge [prior git versions]
2- Resolve the conflict.
3- Don't forget to add and commit the merge.
git pull now should work fine.
No comments:
Post a Comment