Bug 539103 - "Merged" state not cleared in decorator
Summary: "Merged" state not cleared in decorator
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 5.2   Edit
Hardware: PC Windows 10
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-09-15 08:47 EDT by Michael Keppler CLA
Modified: 2018-09-16 04:46 EDT (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Keppler CLA 2018-09-15 08:47:08 EDT 
I just solved a merge conflict and the repository decorator now reads [somebranch - Merged]. When switching to any other branch, the status remains, e.g. the decorator becomes [anyOtherBranch - Merged]. Shouldn't that state be deleted on any branch switch?
Comment 1 Michael Keppler CLA 2018-09-16 04:46:11 EDT 
Command line git solved the puzzle:

You are currently reverting commit 1ed884709.
  (all conflicts fixed: run "git revert --continue")
  (use "git revert --abort" to cancel the revert operation)

Does egit not support that state? I was expecting some similar menu items like for Rebase -> Continue, Abort.