28 Jan
2012
28 Jan
'12
10:24 a.m.
Hi, I'm not sure what is happening between these branches but please wait before merging QA_3_5 into master until the situation is fixed.
The usual recipe of git merge -X ours QA_3_5
does not seem to work.
--
Marc Delisle
http://infomarc.info