Bug 422365 - Conflict decorator should be added to repsitories view
Summary: Conflict decorator should be added to repsitories view
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 3.0.3   Edit
Hardware: PC Linux
: P3 enhancement (vote)
Target Milestone: 5.8   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-22 14:09 EST by Jeremiah Renfro CLA
Modified: 2020-04-15 10:17 EDT (History)
3 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jeremiah Renfro CLA 2013-11-22 14:09:46 EST
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'.
Comment 1 Jeremiah Renfro CLA 2013-11-22 14:13:52 EST
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'.
Comment 2 Robin Stocker CLA 2013-11-23 09:55:27 EST
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.
Comment 3 Jeremiah Renfro CLA 2013-11-25 12:49:18 EST
(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!
Comment 4 Eclipse Genie CLA 2019-12-05 12:52:37 EST
New Gerrit change created: https://git.eclipse.org/r/153923
Comment 5 Eclipse Genie CLA 2020-04-15 10:17:04 EDT
Gerrit change https://git.eclipse.org/r/153923 was merged to [master].
Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=a2081d16a08c8c76e871d3d5980f25a4b062bad6
Comment 6 Thomas Wolf CLA 2020-04-15 10:17:43 EDT
Thanks, Simon!