Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
I add a keyword $log$ in my source file, but when i merge two branch, the log is always conflict,how to avoid ?