> IMHO in such a case it is preferrable to commit to src first to keep it > consistent, even if some of the files have their master in gcc. as long as you don't mind the robo-merge taking it back out again.