Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 368208 - When switching branches, staged deletions are lost
Summary: When switching branches, staged deletions are lost
Status: RESOLVED WORKSFORME
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 381016 (view as bug list)
Depends on:
Blocks:
 
Reported: 2012-01-09 19:14 EST by Sam Davis CLA
Modified: 2013-05-11 18:18 EDT (History)
6 users (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 Sam Davis CLA 2012-01-09 19:14:43 EST 
When a file is deleted in Egit, the change is automatically staged. Then, when switching branches in Egit, the staged deletion is lost. When switching branches on the command line, staged changes are preserved.
Comment 1 Tomasz Zarna CLA 2013-01-03 14:39:04 EST 
*** Bug 381016 has been marked as a duplicate of this bug. ***
Comment 2 Matthias Sohn CLA 2013-05-11 18:18:11 EDT 
I cannot reproduce this with todays nightly build (3.0.0.201305102023)

Either the staged deletion is preserved or in some cases depending on the changes done on the two branches I get a checkout conflict