Bug 487845 - [Synchronize View] Reports conflicting additions for files that were moved via a pull
Summary: [Synchronize View] Reports conflicting additions for files that were moved vi...
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 4.2   Edit
Hardware: All All
: P3 major (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-02-15 18:40 EST by Duncan Calvert CLA
Modified: 2016-02-17 17:50 EST (History)
1 user (show)

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 Duncan Calvert CLA 2016-02-15 18:40:48 EST 
TL;DR:
Conflicting additions that don't actually exist get stuck in view.

Behavior:
After I Pull, if the pull contained moves (i.e. refactoring a package), the Pull works fine on disk but the Synchronize view retains a conflicting addition (red arrow with plus sign) for each file that has been moved. There is no way to get rid of them other than to delete the synchronization and make a new one. A 'git status' on the command line show up-to-date with no changes.

Workaround:
Unpin and delete the Synchronization and make a new one.
Comment 1 Duncan Calvert CLA 2016-02-17 17:50:55 EST 
Found an additional workaround:
In the Git Staging view, move the entries from staged back to unstaged a few times and they disappear.