Mike, the problem that git has is that both you and upstream changed these lines. Now you have to decide which change to keep. Seems kind of silly in this case of course.
On Fri, Jan 10, 2014 at 4:22 PM, Mike Tutkowski <mike.tutkow...@solidfire.com> wrote: > Oh, and to clarify, my first e-mail about this where I showed some diff > output was literally what Git gave me (I didn't modify it at all). It is an > example of where Git was asking me to manually intervene in a situation > where only a new line was added between two statements. Seems weird that it > wouldn't have auto merged that. > > > On Fri, Jan 10, 2014 at 8:10 AM, Mike Tutkowski < > mike.tutkow...@solidfire.com> wrote: > >> 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> >> *™* >> > > > > -- > *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> > *™*
