04.03.2012 16:07, KP Kirchdoerfer пишет: > Hi; > > I know, how I can merge a branch with master. > > But how do I merge a branch with another one, "next" in my case? > > thx kp Just do 'git merge <object>' - object can be branch, tag, commit, and your current branch will have all mods from other branch till <object>. Or do 'git pull <repo> <branch to merge>' if you want do pull and merge in one step.
------------------------------------------------------------------------------ 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