[gcompris-devel] More music activity comments, based on git commit 672eb8eecd 12.09.2012

[Bruno Coudoin]

Le vendredi 14 septembre 2012 à 08:37 +0200, Bruno Coudoin a écrit :
> Perhaps something like this would do it:
> git checkout bethmaster
> git merge -s recursive -X theirs brunomaster 

Hi,

I updated your repository to be in sync with my master branch. The
command above did 'almost' work. It fails to merge binary files. I had
to do a 'git checkout --theirs' on all the wav files. This forced git to
pick mine.

Bruno.