Am 16.02.2012 19:00, schrieb Andrew: > 16.02.2012 19:54, KP Kirchdoerfer пишет: >> Hi Andrew; hi all >> >> just to understand how we use git. >> >> I saw that Andrew merged next with next-experimental. >> So will there be two "next" branches in the near future, or will >> one(next-experimental) replace the other(next)? And if so shouldn't we >> remove the old one, just one get not confused? >> >> kp >> > Merge operation is just to add all commits from one branch (or from > branch till some tag/commit) to another branch. Branch structure in that > case isn't modified, this is just adding changes from one branch to another.
Ok, but how do we decide which one is used as "main" branch for developing the next version? Or is it just my decision to remove remote tracking of branch "next" locally, if _I decide, that next-experimental_ is the way I'd like to go with? Building "new branches is cheap", tracking remote branches is easy - maybe I'm just too afraid about merging? Trying to understand the "second step" of the git concept :) kp ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
