>> >> So good ! >> Yes i will switch again 2.22. But if all is ok we can merge the commit into >> master (with the "same" parent). So andrew can you commit your topic branch >> directly into master (no cherry-pick). You must merge the same topic branch >> that you use to commit into next. If your made changes directly into next >> it's really bad, because we can't merge next into master and using >> cherry-pick can cause problem >> (http://dan.bravender.us/2011/10/20/Why_cherry-picking_should_not_be_part_of_a_normal_git_workflow.html). >> If so alway made a topic branch (fork off from master for example) for all >> you think to put into next. > > Hi Yves; > > if I understand it correct, a topic branch made to include changes to > branch "next" should be kept until the team decides to move a feature > from "next" to "master" and one has to merge the topic branch then to > "master"? > A topic branch is not made to include changes to branch "next" but to branch "master" (or maint for bug fixes). So a topic branch is fork off from master (or maint for old bugfixes). The next branch is only here to test features (store in topic branches) that was not enough stable to be merge directly in master branch.
> Do we have to create a topic branch even for small changes? > Like I'd like to make small update for leaf.cfg to add a comment and > setting for swap. > If your modifications can't be merge directly into master (because it not enough stable or need agreement by others) then yes, make a topic branch and push it on the remote (if you want other to see what you working on). Then you can merge your topic branch into next. Every time you refine your topic branch merge it into next to test. When the topic branch is enough stable it can be merge into master. Yves ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
