Hello Franz,
(I am writing this over the mailing list, since this could also be
important for other developers)
For other developers, I am developing on my own branch and of course at the
end of my thesis, I want this to be integrated back into the master. Stefan
Rossbach explained me that there are two ways of getting my feature back
into the master:
1. Merging the development/actionAwareness branch back into the master
2. Creating patches part by part for the master, based on my
development/actionAwareness branch (thus cherry picking)
My question is which way is the better one? Which benefits do I have with
the one or the other one? What do I have to consider during my development,
when I am deciding for one option?
Cheers,
Damla
------------------------------------------------------------------------------
Slashdot TV. Video for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
DPP-Devel mailing list
DPP-Devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dpp-devel
