Le 8 août 2010 à 11:25, Frank Niessink a écrit : > 2010/8/8 Jérôme Laheurte <[email protected]>: > > WTF ? I tried two times and always got the conflict on task.py... > > I think I had a conflict on task.py earlier (Thrusday or Friday) and > resolved it, maybe you need to do a svn update?
I always make nuke && svn update before merging. Maybe you resolved it and I didn't notice the commit. Whatever, it works now :) Cheers Jérôme
