Merging branches

[François Vogel]

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

What do you think?

Thanks,
Francois