{"thread":{"id":"6624","subject":"Question: next, master and pu branches","startedAt":"2007-02-02T05:41:53Z","lastAt":"2007-02-02T05:41:53Z","messageCount":1,"participants":["Alexander Litvinov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"33338","messageId":"200702021141.53997.lan@academsoft.ru","threadId":"6624","inReplyTo":null,"subject":"Question: next, master and pu branches","fromName":"Alexander Litvinov","fromEmail":"lan@academsoft.ru","sentAt":"2007-02-02T05:41:53Z","receivedAt":"2007-02-02T05:41:53Z","isPatch":false,"sender":{"key":"lan@academsoft.ru","avatar":null},"body":"Hello,\n\nCan somebody explain the meaning of next and pu branches and some documenation \nabout using topic branches.\n\nMy development model use two branches now: stable release and develment \nbranch. All changes in the stable release branch are bug-fix only changes. \nAll (or most) of them must go to development release. Now I do this using \ncherry-pick but it is not easy to track what was merged especialy when merge \npruduce confic resloved by hands. Stable branch live long life, much more \nthan 100 commits. \n\nIt seems topic branches can help me here, but reading Documentation under git \nsources teach to make topic branch from the branch point and then merge it to \nboth branches. This can work while stable branch has short life and was not \nheavily rewritten. \n\nIf there any technique that can help me ?\n"}]}