Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » synchronize view shows wrong conflicts
synchronize view shows wrong conflicts [message #1265644] Thu, 06 March 2014 10:58 Go to next message
wentwog wentwog is currently offline wentwog wentwogFriend
Messages: 1
Registered: March 2014
Junior Member
Hi.
My Egit version is 2.3.
I've synced two local branches. Using Team->Advanced->Synchronize->select second branch.

In the synchronize view I can see files marked as conflict while there is no differences I can see when I open em in compare editor or creating patch.

So why, if files are the same, they are showed as if they're having conflicts ?

The pictures:
index.php/fa/17656/0/
index.php/fa/17657/0/
  • Attachment: 1.png
    (Size: 26.12KB, Downloaded 97 times)
  • Attachment: 2.png
    (Size: 15.30KB, Downloaded 98 times)
Re: synchronize view shows wrong conflicts [message #1267351 is a reply to message #1265644] Sat, 08 March 2014 22:23 Go to previous message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 612
Registered: July 2009
Senior Member
2.3 is pretty old, try 3.3
Previous Topic:How to checkout a file
Next Topic:CloneCommand doesn't add the clone to Git Repositories view
Goto Forum:
  


Current Time: Sun Nov 23 17:24:53 GMT 2014

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

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