Eclipse Community Forums: EGit / JGit » Pulled conflict file not resolvable

Home » Eclipse Projects » EGit / JGit » Pulled conflict file not resolvable(Conflict file shows entire class in Head and Branch)

Show: Today's Messages :: Show Polls :: Message Navigator

Pulled conflict file not resolvable [message #1779611]

Wed, 10 January 2018 10:02

Sudha Mathew

Messages: 2
Registered: January 2017

Junior Member

Hi Everyone,
When I pull the remote files to my local branch and I expect some conflicts because another team member worked on it. How ever everytime the conflicted portion is not shown properly, Instead the entire class or atleast major portion of it appears under >>>>>>> Head and >>>>>>> branch, even though the actual change may be a few lines and rest of the code is the same.
Is there some format difference or something we have to set up to get the copies similar.

Report message to a moderator

Previous Topic:	Unable to push file to a remote repository
Next Topic:	Replace with Head Revision - not keeping original file permissions

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Mon Jun 18 10:08:26 GMT 2018

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter