Ecllipse with GIT Conflict issue
I am using Ecllipse with GIT. i have done my chnages in index.jsp then
when i fetch from upstream and then pull i have got conflict error in
index.jsp
then i have synchronized my work space and append changes in my file. then
i am doing commit.' but at that time i am getting Rejected Non Fast
Forward error how i will solved it ?
and also i want toknow why i am not getting that conflict symbol in that
conflict file. like <<<<<<<< symbol.
please answer me because our organization all employee are stuck in this
problem.
No comments:
Post a Comment