Re: Weird Diffs Sometimes

[Wei ZHOU]

It means some conflicts between the source branch and destination branch.
You need to fix them manually.
It is normal in version control systems (git,svn)