|
|
Re: merge flags all files as modified [message #666141 is a reply to message #666129] |
Tue, 19 April 2011 10:08 |
Maxime Jeanmart Messages: 35 Registered: November 2010 |
Member |
|
|
I don't have access to github inside the company. However, I could reproduce the problem with a brand new repository.
Here are my steps:
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"
now all files are marked "Mod., not staged", including C.java, .classpath and .project.
eGit + jGit versions = 0.11.3
Can you reproduce it?
I created Bug 343253
Max
|
|
|
|
|
|
Powered by
FUDForum. Page generated in 0.03642 seconds