Re: LEAF rebase/merge

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 :)

14.01.2016 10:20, Erich Titl пишет:
> Hi Yves
>
> Am 14.01.2016 um 09:10 schrieb Yves Blusseau:
>> Hi Erich,
>>
>> the best is to merge the new-initrd branch into the maint or master.
>> In either case (merge or rebase) you need to resolve the conflicts.
>> There are no other alternative.
> Pretty disappointing :-(
>
> Is there a best practise strategy to avoid conflicts? With Git conflicts
> appear to be inherent.
>
> cheers
>
> Erich
>
>
>
> ------------------------------------------------------------------------------
> 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
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/leaf-devel


------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-devel