Merging branches

[François Vogel]

François Vogel said on 29/10/2008 22:32:
> Vincent COUVERT said on 22/10/2008 15:06:
>> // Merge "master" branch modifications to "scipad" branch
>> git merge master
> 
> Today this spits:
> 
> $ git merge master
> error: Entry 'scilab/modules/pvm/src/nopvm/nopvm.rc' not uptodate. 
> Cannot merge.
> fatal: merging of trees 9bccd6d1cce5eb8f555f48d3253184ff6013d578 and 
> 3ee3dd5796795c1659da5820f0a5c4090be9011b failed
> Merge with strategy recursive failed.
> 
> I was not able to solve this. I tried git clean -f at no avail, and even 
> completely erased my repository and started from the very beginning:
> git clone git at git.scilab.org:scilab
> git branch scipad refs/remotes/origin/scipad
> git checkout scipad
> git merge master

Very strange.
After initial clone I get:

$ git status
# On branch scipad
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#       modified:   scilab/modules/pvm/src/nopvm/nopvm.rc
#       modified:   scilab/modules/randlib/src/norandlib/norandlib.rc
#       modified:   scilab/modules/renderer/.checkstyle
#       modified:   scilab/modules/renderer/.classpath
#       modified:   scilab/modules/renderer/.project
#       modified:   scilab/modules/renderer/src/norenderer/norenderer.rc
#       modified:   scilab/modules/scicos/src/c/noscicos/noscicos.rc
#       modified:   scilab/modules/shell/.checkstyle
#       modified:   scilab/modules/shell/.classpath
#       modified:   scilab/modules/shell/.project
#       modified:   scilab/modules/shell/src/c/shell.rc
#       modified:   scilab/modules/sound/src/c/sound.rc
#       modified:   scilab/modules/sound/src/nosound/nosound.rc
#       modified:   scilab/modules/spreadsheet/src/c/spreadsheet.rc
#       modified: 
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc
#       modified:   scilab/modules/time/src/c/time.rc
#       modified:   scilab/modules/umfpack/src/c/umfpack.rc
#       modified:   scilab/modules/umfpack/src/noumfpack/noumfpack.rc
#       modified:   scilab/modules/windows_tools/.checkstyle
#       modified:   scilab/modules/windows_tools/.classpath
#       modified:   scilab/modules/windows_tools/.project
#       modified:   scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
#       modified: 
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc
#       modified:   scilab/modules/windows_tools/src/c/windows_tools.rc
#       modified: 
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc
#
no changes added to commit (use "git add" and/or "git commit -a")


How can I have locally modified files right after cloning?

Puzzled...

Francois