Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 324361

Summary:

[sync] Conflicts not shown in changeset mode

Product:

[Technology] EGit

Reporter:

Benjamin Muskalla <b.muskalla>

Component:

Assignee:

Project Inbox <egit.ui-inbox>

Status:

NEW ---

QA Contact:

Severity:

normal

Priority:

CC:

stefan.lay

Version:

0.9.0

Target Milestone:

---

Hardware:

OS:

Linux

Whiteboard:

Attachments:

Description	Flags
screenshot	none

Description Benjamin Muskalla

2010-09-02 19:46:23 EDT

Using the changeset mode in the sync view, conflicts are not shown. You need to switch to another model in order to see them.

Comment 1 Benjamin Muskalla

2010-09-02 19:47:08 EDT

Created attachment 178111 [details]
screenshot

.

Comment 2 Stefan Lay

2010-10-01 04:50:26 EDT

The change set model shows incoming and outgoing commits. How can a commit be incoming and outgoing?

Do you mean that we should mark commits as conflicting which lead to the conflicts in the workspace model?

The summary in the status bar shows conflicts for the workspace model.

Comment 3 Dariusz Luksza

2011-11-04 05:25:01 EDT

Git Commit model would show conflicting changes only when you hit conflicts during merge/rebase process. In other cases you won't see any conflicts because git history is organized in the way that you need to resolve all conflicts before committing anything.

As Stefan mentioned above status bar summary shows status of workspace model ... of course we could try to change status presentation when commit model is enabled (eg. show incoming/outgoing commits and number of modified changes in index and in workspace). But I think this will require some hacking in team framework.

Regardless issue described above I would say that it is invalid and open separate enhancement but for the status bar.