28 Jan
2012
28 Jan
'12
10:53 a.m.
Le 2012-01-28 04:24, Marc Delisle a écrit :
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.
Ok, we should be fine now.
--
Marc Delisle
http://infomarc.info