Ok, thanks! Alexandre
> On Jul 8, 2015, at 11:39 PM, Thierry Goubier <[email protected]> > wrote: > > Le 08/07/2015 23:25, Alexandre Bergel a écrit : >> Thanks Thierry. Seems to work. But I get this error: >> >> ~/HackathonSattose2015> git merge master >> readlink: illegal option -- e >> usage: readlink [-n] [file ...] >> readlink: illegal option -- e >> usage: readlink [-n] [file ...] >> readlink: illegal option -- e >> usage: readlink [-n] [file …] > > Can you edit the merge file > (~/Dropbox/Workspace/GitFileTree-MergeDriver/merge) and change that line: > > DIR=`readlink -e "$0"` || DIR="$0"; > > to: > > DIR=`readlink "$0"` || DIR="$0"; > > (I would have expected this to work as well on a mac... but it isn't the case > :(:( The -e option is there to try to see through symlinks. I'll correct > that.) > > Thierry > >> >> Any idea? >> >> Alexandre >> >> >>> On Jul 8, 2015, at 3:31 PM, Thierry Goubier <[email protected]> >>> wrote: >>> >>> >>> >>> 2015-07-08 15:24 GMT+02:00 Alexandre Bergel <[email protected]>: >>> Thierry, >>> >>>>> $ git config --get merge.mcVersion.driver >>>> >>>> ~/HackathonSattose2015> git config --get merge.mcVersion.driver >>>> pathToGitFileTree-MergeDriver/merge --version %O %A %B >>> >>> Any idea how I can merge then? >>> Is this value what you expected? >>> >>> No. >>> >>> If you have your path for the merge command (something like >>> /User/Alexandre/GitFileTree-MergeDriver/merge ), then it should be: >>> >>> ~/HackathonSattose2015> git config --get merge.mcVersion.driver >>> /User/Alexandre/GitFileTree-MergeDriver/merge --version %O %A %B >>> >>> To correct it, what you can do by hand is: >>> >>> git config --global merge.mcVersion.driver >>> "/User/Alexandre/GitFileTree-MergeDriver/merge --version %O %A %B" >>> git config --global merge.mcMethodProperties.driver >>> "/User/Alexandre/GitFileTree-MergeDriver/merge --methodProperties %O %A %B" >>> git config --global merge.mcProperties.driver >>> "/User/Alexandre/GitFileTree-MergeDriver/merge --properties %O %A %B" >>> >>> Don't forget to update the path ! >>> >>> Thierry >>> >>> >>> Cheers, >>> Alexandre >>> -- >>> _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: >>> Alexandre Bergel http://www.bergel.eu >>> ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;. >>> >>> >>> >>> >>> >> > > -- _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: Alexandre Bergel http://www.bergel.eu ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
