Yeah, that's definitely true, Wei. The weird part is how Git can solve some of them automatically that are quite complex, but then it gives up and asks for manual intervention on some other ones (like sometimes when a new line is inserted between instructions).
I like Git a lot, I just happened to notice here that SVN almost never asked me to manually intervene for such trivial issues. On Fri, Jan 10, 2014 at 12:56 AM, Wei ZHOU <ustcweiz...@gmail.com> wrote: > 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) > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud<http://solidfire.com/solution/overview/?video=play> *™*
