Skip to main content

Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Pulled conflict file not resolvable(Conflict file shows entire class in Head and Branch)
Pulled conflict file not resolvable [message #1779611] Wed, 10 January 2018 10:02
Sudha Mathew is currently offline Sudha MathewFriend
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.
Previous Topic:Authentication problem when connecting to Git in TFS after migrating from JGit 3.2 to 4.1
Next Topic:Replace with Head Revision - not keeping original file permissions
Goto Forum:

Current Time: Sat Feb 29 08:26:32 GMT 2020

Powered by FUDForum. Page generated in 0.06881 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top