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

[leaf-devel] LEAF Project

Hi Folks I just looked at leaf.sourceforge.net and was wondering Created on 2003-02-04 10:24:27 by install Updated on 2005-08-24 11:48:30 by mhnoyes Latest news: LEAF Bering-uClibc maintenance update 4.3.3 released Wouldn't we think that the release of 5.2.3 it worth a note? Should we

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

[leaf-devel] Leaf master branch

Hi Folks In my effort to port new-initrd to master I looked at the linux directory Why do we have config files for 4.1 and 4.4 plus the corresponding tarballs? Shouldn't we make the config files release agnostic? cheers ET

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

Re: [leaf-devel] Leaf master branch

Am Donnerstag, 14. Januar 2016, 09:49:05 schrieb Erich Titl: > Hi Folks > > In my effort to port new-initrd to master I looked at the linux directory > > Why do we have config files for 4.1 and 4.4 plus the corresponding tarballs? > Shouldn't we make the config files release agnostic? It is

Re: [leaf-devel] Leaf master branch

Hi KP Am 14.01.2016 um 15:45 schrieb kp kirchdoerfer: > Am Donnerstag, 14. Januar 2016, 09:49:05 schrieb Erich Titl: >> Hi Folks >> >> In my effort to port new-initrd to master I looked at the linux directory >> >> Why do we have config files for 4.1 and 4.4 plus the corresponding tarballs? >>