Re: LEAF rebase/merge
Erich Titl <[email protected]>
| Newsgroups | gmane.linux.leaf.devel |
|---|---|
| Message-ID | <[email protected]> |
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