Community
Participate
Working Groups
In synchronizing perspective, after synchronizing a Ivy project, exactly when there are conflicts, there is an error. You mark as merged it does not go away like with svn. The class or the file stays there with the mark of conflicts. The same happens with Override, or with Merge. Non of this ones work. Very annoying!!! Most of the time I have to save all my changes and download a new clean version of the project and apply the changes. Please make sure it works just like with svn.
Moving to egit for comments.
Luis, can you please: 1) Provide EGit and Eclipse version you are using? 2) Provide steps to reproduce 3) Consider that Git != SVN and in many cases the use model can differ?
Eclipse VErsion: Eclipse Java EE IDE for Web Developers. Version: Mars.1 Release (4.5.1) Build id: 20150924-1200 Git Pluggings: Eclipse Git Team Provider 4.1.0.201509280440-r org.eclipse.egit.feature.group Eclipse EGit Eclipse Git Team Provider - Gitflow support 4.1.0.201509280440-r org.eclipse.egit.gitflow.feature.feature.group Eclipse EGit Eclipse Git Team Provider - Source Code 4.1.0.201509280440-r org.eclipse.egit.source.feature.group Eclipse EGit Eclipse Git Team Provider - Task focused interface 4.1.0.201509280440-r org.eclipse.egit.mylyn.feature.group Eclipse EGit Steps to reproduce: 1. Select in Project Explorer the project to synchronize and right click. 2. Select Team > Synchronize Workspace (Enter password if required) 3. In the Synchronize Perspective select a java class that has the icon of conflicts. (It has local changes and it has been modified in the repository by someone else). 4. Accept the changes from the repository. 5. Right click the class and select "Mark as Merged" Result: The class stays with the mark of Conflicts and it does not refresh. Even if you do Override, the class stays with the mark of conflicts and does not refresh. Even if you click on "Merge" it stays the same. Consequense: You cannot commit the merged changes. Really annoying 5. The java class will have
