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

Bug 368208

Summary:	When switching branches, staged deletions are lost
Product:	[Technology] EGit	Reporter:	Sam Davis <sam.davis>
Component:	Core	Assignee:	Project Inbox <egit.core-inbox>
Status:	RESOLVED WORKSFORME	QA Contact:
Severity:	normal
Priority:	P3	CC:	b.muskalla, loskutov, lucas.panjer, matthias.schmalz, matthias.sohn, tomasz.zarna
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Sam Davis

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

2013-01-03 14:39:04 EST

*** Bug 381016 has been marked as a duplicate of this bug. ***

Comment 2 Matthias Sohn

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