Community
Participate
Working Groups
When merging results in a conflict, the package explorer is decorated with conflict icons (currently a red diamond) to indicate which file(s) are conflicting. This works great for files that appear in the package explorer. However many files that are tracked in the repository do not appear in the package explorer. One great example is the classpath file. A user can currently navigate to the 'Repositories View' and 'Add file to index' to indicate that the conflict has been resolved... if they can remember which file(s) conflicted. The repositories view should include appropriate conflict decorator(s) when the head is 'Conflict'.
After thinking about it some more, it might be a good idea to create a UI element to 'View all conflicting files' when the head is 'Conflict'; basically a graphic representation of 'git diff --name-only --diff-filter=U'.
Do you know about the "Git Staging" view? It shows all conflicting files and allows to merge and stage them. It's also very useful for committing in general: https://wiki.eclipse.org/EGit/User_Guide#Git_Staging_View Apart from that, the repo view getting conflict decorations would be nice, marked as enhancement and helpwanted.
(In reply to Robin Stocker from comment #2) > Do you know about the "Git Staging" view? It shows all conflicting files and > allows to merge and stage them. It's also very useful for committing in > general: > > https://wiki.eclipse.org/EGit/User_Guide#Git_Staging_View > > Apart from that, the repo view getting conflict decorations would be nice, > marked as enhancement and helpwanted. I was aware of the view, but have never used it during conflict resolution. I will check it out. Thanks!
New Gerrit change created: https://git.eclipse.org/r/153923
Gerrit change https://git.eclipse.org/r/153923 was merged to [master]. Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=a2081d16a08c8c76e871d3d5980f25a4b062bad6
Thanks, Simon!