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

Bug 343253

Summary:	merge flags all files as modified
Product:	[Technology] EGit	Reporter:	Maxime Jeanmart <maxime.jeanmart>
Component:	Core	Assignee:	Project Inbox <egit.core-inbox>
Status:	RESOLVED INVALID	QA Contact:
Severity:	normal
Priority:	P3	CC:	robin.rosenberg
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Windows XP
Whiteboard:

Description Maxime Jeanmart

2011-04-19 06:08:14 EDT

Build Identifier: M20110210-1200

Each time I merge 2 branches (either from same repo or from origin), I have all my files flagged as changed and must commit them all. 
It's hard after that to verify if the merge was correctly done because we don't have a way to quickly see what changed.
Remark: using eGit+jGit 0.11.3


Reproducible: Always

Steps to Reproduce:
1.Created the repository using "git extensions"
2. creates a Java project in repository
3. share the project
4. add 3 classes: A, B, C
5. create "work" branch, checkout
6. edit A, commit
7. checkout master
8. edit B, commit
9. checkout "work"
10. edit A, commit
11. checkout master
12. merge with "work"
13.now all files are marked "Mod., not staged", including C.java, .classpath and .project.

Comment 1 Maxime Jeanmart

2011-04-21 03:26:27 EDT

it seems the reason why it happens is because I created the repository using git extensions. Up to you to decide if you support those repositories or not...

Comment 2 Robin Rosenberg

2011-09-13 22:59:02 EDT

Could this be related to line-endings?

Comment 3 Maxime Jeanmart

2011-10-03 13:07:44 EDT

Maybe, but this seems to be linked to how the repository was first created since this only happens when it was created using "git extensions" tools. So I was thinking more about some repository settings.

Comment 4 Robin Rosenberg

2013-01-01 09:17:57 EST

Probably configuration related. If not, please open with more information.