Re: [leaf-devel] LEAF rebase/merge

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. Yves > Le 14 janv. 2016 à 08:10, Erich Titl a écrit : > > Hi Yves > > KP has asked me to

Re: [leaf-devel] LEAF rebase/merge

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

Re: [leaf-devel] LEAF rebase/merge

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

Re: [leaf-devel] 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