Re: [leaf-devel] Managing branches with git

2012-08-09 Thread Andrew
09.08.2012 20:16, KP Kirchdoerfer пишет: > Am 05.08.2012 16:21, schrieb KP Kirchdoerfer: >> Hi Yves; >> >> took some time to respond, cause I've updated my router to latest >> changes, and esp. splitting initrd into initrd and initmod needed some >> precautions before I lose connection at all (main

Re: [leaf-devel] Managing branches with git

2012-08-09 Thread KP Kirchdoerfer
Am 05.08.2012 16:21, schrieb KP Kirchdoerfer: > Hi Yves; > > took some time to respond, cause I've updated my router to latest > changes, and esp. splitting initrd into initrd and initmod needed some > precautions before I lose connection at all (mainly because I had to > update syslinux, which wa

Re: [leaf-devel] Managing branches with git

2012-08-05 Thread KP Kirchdoerfer
Hi Yves; took some time to respond, cause I've updated my router to latest changes, and esp. splitting initrd into initrd and initmod needed some precautions before I lose connection at all (mainly because I had to update syslinux, which was easy in the end). Am 02.08.2012 22:23, schrieb Yves Blu

Re: [leaf-devel] Managing branches with git

2012-08-02 Thread Yves Blusseau
Le 2 août 2012 à 19:01, KP Kirchdoerfer a écrit : > Am 31.07.2012 19:33, schrieb Yves Blusseau: >> >> Le 31 juil. 2012 à 17:35, KP Kirchdoerfer a écrit : >> >>> Hi Yves; >>> >>> I've looked into the links you've send and start to get it. Though I >>> dislike the graphs that try to explain some

Re: [leaf-devel] Managing branches with git

2012-08-02 Thread KP Kirchdoerfer
Am 31.07.2012 19:33, schrieb Yves Blusseau: > > Le 31 juil. 2012 à 17:35, KP Kirchdoerfer a écrit : > >> Hi Yves; >> >> I've looked into the links you've send and start to get it. Though I >> dislike the graphs that try to explain something which is IMHO pretty >> clear, *once* one understood it

Re: [leaf-devel] Managing branches with git

2012-08-02 Thread KP Kirchdoerfer
Am 30.07.2012 19:09, schrieb Yves Blusseau: > Hi all, > is it possible to avoid merge workflow to have a linear history of > commits and avoid the conflicts on the repository ? > Here are some articles that explain why Merge Workflow is "bad": > http://www.randyfay.com/node/89 > http://www.randyfa

Re: [leaf-devel] Managing branches with git

2012-07-31 Thread Yves Blusseau
Le 31 juil. 2012 à 17:35, KP Kirchdoerfer a écrit : > Hi Yves; > > I've looked into the links you've send and start to get it. Though I > dislike the graphs that try to explain something which is IMHO pretty > clear, *once* one understood it, and less helpful before. (Not your fault!) > > Am 31

Re: [leaf-devel] Managing branches with git

2012-07-31 Thread KP Kirchdoerfer
Hi Yves; I've looked into the links you've send and start to get it. Though I dislike the graphs that try to explain something which is IMHO pretty clear, *once* one understood it, and less helpful before. (Not your fault!) Am 31.07.2012 09:36, schrieb Yves Blusseau: > Le 30/07/2012 19:46, KP Kir

Re: [leaf-devel] Managing branches with git

2012-07-31 Thread Yves Blusseau
Le 30/07/2012 19:46, KP Kirchdoerfer a écrit : > Though a short note about what we have done over the weekend, maybe not > in the best way. > > 4.3 has been tagged and released. A new branch for 4.3-fixes has been > created. So 4.3 (and 4.x) has put into maintenance mode. > The next branch has been

Re: [leaf-devel] Managing branches with git

2012-07-30 Thread KP Kirchdoerfer
Am 30.07.2012 19:09, schrieb Yves Blusseau: > Hi all, > is it possible to avoid merge workflow to have a linear history of > commits and avoid the conflicts on the repository ? > Here are some articles that explain why Merge Workflow is "bad": > http://www.randyfay.com/node/89 > http://www.randyfa

[leaf-devel] Managing branches with git

2012-07-30 Thread Yves Blusseau
Hi all, is it possible to avoid merge workflow to have a linear history of commits and avoid the conflicts on the repository ? Here are some articles that explain why Merge Workflow is "bad": http://www.randyfay.com/node/89 http://www.randyfay.com/node/91 Also it's preferable to commit only new "