Hi Andrew Am 14.01.2016 um 11:04 schrieb Andrew: > Hi. > > Git conflict appears when there's two modifications of same code in > merged branches. > > So only case of avoiding it - don't touch code which is modified in > other branch, that is impossible in real world :)
So I thought, anyway I am trying not to disturb too much cheers ET ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140 _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
