On 30/09/13 17:11, Iván Briano wrote: > On Mon, Sep 30, 2013 at 10:19 AM, Michael Blumenkrantz > <[email protected]> wrote: >> whatisthisidonteven.jpg >> >> http://haugom.tk/wp-content/uploads/2013/08/what+is+this+I+don+t+even+_e6935e220e54cbbdf5685ce5d569e210.jpg >> > > It's a merge conflict party and you are all invited. >
Usually the case, yeah. However there are meant to be git am/apply flags that should help with ignoring those. I'm not sure, as I've never tried them. -- Tom. ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
