On 03/04/2012 06:07 AM, KP Kirchdoerfer wrote: > 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?
KP, I'll likely show my git ignorance with this post. Please verify my comments/suggestions below with Andrew before you do anything. http://book.git-scm.com/3_basic_branching_and_merging.html http://book.git-scm.com/5_advanced_branching_and_merging.html I believe if you have the "next" branch checked out (i.e. active) you should be able to commit and push. $ git checkout next $ git git commit -a $ git push If you're trying to merge "next" into another branch: $ git checkout another $ git merge next BTW, gitk is a great visualisation tool. -- Mike Noyes http://sourceforge.net/users/mhnoyes https://profiles.google.com/mhnoyes ------------------------------------------------------------------------------ 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
