Eclipse Community Forums: EGit / JGit » synchronize view shows wrong conflicts

Home » Eclipse Projects » EGit / JGit » synchronize view shows wrong conflicts

synchronize view shows wrong conflicts [message #1265644]

Thu, 06 March 2014 05:58

Eclipse User

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/

Attachment: 1.png
(Size: 26.12KB, Downloaded 503 times)
Attachment: 2.png
(Size: 15.30KB, Downloaded 495 times)

Re: synchronize view shows wrong conflicts [message #1267351 is a reply to message #1265644]

Sat, 08 March 2014 17:23

Eclipse User

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:

-=] Back to Top [=-

Current Time: Wed Jul 16 21:18:14 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter