Re: Fail to merge staging - make doc is failing

[James]

Hello,

Just to add...

On 20/09/13 09:17, James wrote:
> Would it be possible for someone else to edit their 
> .lilypond-patchy-config file to use the -j8 option (no matter how many 
> CPUs they have) and see fi they get it too? It kicks in pretty near 
> the start of the make doc so you wouldn't have to wait that long.
If you want to force patchy-merge to run, you simply cat dev/null to 
your .lilypond-patchy-cache file. It will then try and merge because it 
knows no different but will detect that another revision has been pushed 
and so will not bother to do anything. It;s just  a convenient way to 
force patchy-merge to run no matter if there really is anything to merge.

James