Re: Help for upgrading a custom 2.3 to 2.4 using GIT.

Thanks Davo. Now, I'm testing it..

I get the problem "No such strategy ... patience" in the next line

git merge --strategy-option=patience merge_helper_branch

Maybe the GIT version? Mine is 1.7.1.

I'll try to test without the "--strategy-option" but I'm not sure if this is a good idea